From 373363cb693b80c172534467e0458cea96c64f2a Mon Sep 17 00:00:00 2001
From: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Mon, 31 Mar 1997 11:19:01 -0300
Subject: [PATCH] new name for old "mem.h" (conflicts with some compiler
 libraries)

---
 fallback.c |  4 ++--
 func.c     |  2 +-
 hash.c     |  4 ++--
 inout.c    |  4 ++--
 lex.c      |  4 ++--
 lua.stx    |  4 ++--
 luamem.c   |  4 ++--
 luamem.h   |  6 +++---
 makefile   | 26 +++++++++++++-------------
 opcode.c   |  4 ++--
 table.c    |  4 ++--
 tree.c     |  4 ++--
 12 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/fallback.c b/fallback.c
index 32ff53d8..c39c115b 100644
--- a/fallback.c
+++ b/fallback.c
@@ -3,13 +3,13 @@
 ** TecCGraf - PUC-Rio
 */
  
-char *rcs_fallback="$Id: fallback.c,v 1.33 1997/03/24 17:13:22 roberto Exp roberto $";
+char *rcs_fallback="$Id: fallback.c,v 1.34 1997/03/31 14:02:58 roberto Exp roberto $";
 
 #include <stdio.h>
 #include <string.h>
  
 #include "auxlib.h"
-#include "mem.h"
+#include "luamem.h"
 #include "fallback.h"
 #include "opcode.h"
 #include "lua.h"
diff --git a/func.c b/func.c
index f6055041..5b15228e 100644
--- a/func.c
+++ b/func.c
@@ -2,7 +2,7 @@
 
 #include "luadebug.h"
 #include "table.h"
-#include "mem.h"
+#include "luamem.h"
 #include "func.h"
 #include "opcode.h"
 
diff --git a/hash.c b/hash.c
index 9e0170c4..801bf971 100644
--- a/hash.c
+++ b/hash.c
@@ -3,10 +3,10 @@
 ** hash manager for lua
 */
 
-char *rcs_hash="$Id: hash.c,v 2.37 1997/03/21 18:52:37 roberto Exp roberto $";
+char *rcs_hash="$Id: hash.c,v 2.38 1997/03/31 14:02:58 roberto Exp roberto $";
 
 
-#include "mem.h"
+#include "luamem.h"
 #include "opcode.h"
 #include "hash.h"
 #include "table.h"
diff --git a/inout.c b/inout.c
index f2aec14c..f7b789db 100644
--- a/inout.c
+++ b/inout.c
@@ -5,7 +5,7 @@
 ** Also provides some predefined lua functions.
 */
 
-char *rcs_inout="$Id: inout.c,v 2.47 1997/03/19 19:41:10 roberto Exp roberto $";
+char *rcs_inout="$Id: inout.c,v 2.48 1997/03/20 19:20:23 roberto Exp roberto $";
 
 #include <stdio.h>
 #include <string.h>
@@ -18,7 +18,7 @@ char *rcs_inout="$Id: inout.c,v 2.47 1997/03/19 19:41:10 roberto Exp roberto $";
 #include "tree.h"
 #include "lua.h"
 #include "hash.h"
-#include "mem.h"
+#include "luamem.h"
 #include "fallback.h"
 
 
diff --git a/lex.c b/lex.c
index 76c48040..a019c6ef 100644
--- a/lex.c
+++ b/lex.c
@@ -1,11 +1,11 @@
-char *rcs_lex = "$Id: lex.c,v 2.42 1997/02/07 13:49:46 roberto Exp roberto $";
+char *rcs_lex = "$Id: lex.c,v 2.43 1997/03/18 15:30:50 roberto Exp roberto $";
 
 
 #include <ctype.h>
 #include <string.h>
 
 #include "auxlib.h"
-#include "mem.h"
+#include "luamem.h"
 #include "tree.h"
 #include "table.h"
 #include "lex.h"
diff --git a/lua.stx b/lua.stx
index cb0a29d3..e9ddc33a 100644
--- a/lua.stx
+++ b/lua.stx
@@ -1,13 +1,13 @@
 %{
 
-char *rcs_luastx = "$Id: lua.stx,v 3.44 1997/02/13 16:18:39 roberto Exp roberto $";
+char *rcs_luastx = "$Id: lua.stx,v 3.45 1997/03/06 17:30:55 roberto Exp roberto $";
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "luadebug.h"
-#include "mem.h"
+#include "luamem.h"
 #include "lex.h"
 #include "opcode.h"
 #include "hash.h"
diff --git a/luamem.c b/luamem.c
index be08b608..59cc8c11 100644
--- a/luamem.c
+++ b/luamem.c
@@ -3,11 +3,11 @@
 ** TecCGraf - PUC-Rio
 */
 
-char *rcs_mem = "$Id: mem.c,v 1.14 1997/02/25 11:12:28 roberto Exp roberto $";
+char *rcs_luamem = "$Id: mem.c,v 1.14 1997/03/03 19:55:38 roberto Exp roberto $";
 
 #include <stdlib.h>
 
-#include "mem.h"
+#include "luamem.h"
 #include "lua.h"
 
 
diff --git a/luamem.h b/luamem.h
index cbc973b2..e338183d 100644
--- a/luamem.h
+++ b/luamem.h
@@ -1,11 +1,11 @@
 /*
 ** mem.c
 ** memory manager for lua
-** $Id: mem.h,v 1.7 1996/04/22 18:00:37 roberto Exp roberto $
+** $Id: luamem.h,v 1.8 1996/05/24 14:31:10 roberto Exp roberto $
 */
  
-#ifndef mem_h
-#define mem_h
+#ifndef luamem_h
+#define luamem_h
 
 #ifndef NULL
 #define NULL 0
diff --git a/makefile b/makefile
index 8e23fcdd..78f1a670 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.28 1997/03/05 13:37:04 roberto Exp roberto $
+# $Id: makefile,v 1.29 1997/03/17 17:01:10 roberto Exp roberto $
 
 #configuration
 
@@ -28,7 +28,7 @@ LUAOBJS = \
 	inout.o \
 	tree.o \
 	fallback.o \
-	mem.o \
+	luamem.o \
 	func.o \
 	undump.o \
 	auxlib.o
@@ -77,28 +77,28 @@ clear	:
 
 
 auxlib.o: auxlib.c lua.h
-fallback.o: fallback.c mem.h fallback.h lua.h opcode.h types.h tree.h \
+fallback.o: fallback.c luamem.h fallback.h lua.h opcode.h types.h tree.h \
  func.h table.h hash.h
 func.o: func.c luadebug.h lua.h table.h tree.h types.h opcode.h func.h \
- mem.h
-hash.o: hash.c mem.h opcode.h lua.h types.h tree.h func.h hash.h \
+ luamem.h
+hash.o: hash.c luamem.h opcode.h lua.h types.h tree.h func.h hash.h \
  table.h
 inout.o: inout.c lex.h opcode.h lua.h types.h tree.h func.h inout.h \
- table.h hash.h mem.h fallback.h
+ table.h hash.h luamem.h fallback.h
 iolib.o: iolib.c lua.h luadebug.h lualib.h
-lex.o: lex.c mem.h tree.h types.h table.h opcode.h lua.h func.h lex.h \
+lex.o: lex.c luamem.h tree.h types.h table.h opcode.h lua.h func.h lex.h \
  inout.h luadebug.h parser.h
 lua.o: lua.c lua.h lualib.h
 mathlib.o: mathlib.c lualib.h lua.h
-mem.o: mem.c mem.h lua.h
-opcode.o: opcode.c luadebug.h lua.h mem.h opcode.h types.h tree.h \
+luamem.o: luamem.c luamem.h lua.h
+opcode.o: opcode.c luadebug.h lua.h luamem.h opcode.h types.h tree.h \
  func.h hash.h inout.h table.h fallback.h undump.h
-parser.o: parser.c luadebug.h lua.h mem.h lex.h opcode.h types.h \
+parser.o: parser.c luadebug.h lua.h luamem.h lex.h opcode.h types.h \
  tree.h func.h hash.h inout.h table.h
 strlib.o: strlib.c lua.h lualib.h
-table.o: table.c mem.h opcode.h lua.h types.h tree.h func.h hash.h \
+table.o: table.c luamem.h opcode.h lua.h types.h tree.h func.h hash.h \
  table.h inout.h fallback.h luadebug.h
-tree.o: tree.c mem.h lua.h tree.h types.h lex.h hash.h opcode.h func.h \
+tree.o: tree.c luamem.h lua.h tree.h types.h lex.h hash.h opcode.h func.h \
  table.h fallback.h
-undump.o: undump.c opcode.h lua.h types.h tree.h func.h mem.h table.h \
+undump.o: undump.c opcode.h lua.h types.h tree.h func.h luamem.h table.h \
  undump.h
diff --git a/opcode.c b/opcode.c
index 595277a9..67128d23 100644
--- a/opcode.c
+++ b/opcode.c
@@ -3,7 +3,7 @@
 ** TecCGraf - PUC-Rio
 */
 
-char *rcs_opcode="$Id: opcode.c,v 3.86 1997/03/20 19:20:43 roberto Exp roberto $";
+char *rcs_opcode="$Id: opcode.c,v 3.87 1997/03/31 14:02:58 roberto Exp roberto $";
 
 #include <setjmp.h>
 #include <stdio.h>
@@ -11,7 +11,7 @@ char *rcs_opcode="$Id: opcode.c,v 3.86 1997/03/20 19:20:43 roberto Exp roberto $
 #include <stdlib.h>
 
 #include "luadebug.h"
-#include "mem.h"
+#include "luamem.h"
 #include "opcode.h"
 #include "hash.h"
 #include "inout.h"
diff --git a/table.c b/table.c
index cdcf4673..71912404 100644
--- a/table.c
+++ b/table.c
@@ -3,9 +3,9 @@
 ** Module to control static tables
 */
 
-char *rcs_table="$Id: table.c,v 2.63 1997/03/26 22:22:41 roberto Exp roberto $";
+char *rcs_table="$Id: table.c,v 2.64 1997/03/31 14:02:58 roberto Exp roberto $";
 
-#include "mem.h"
+#include "luamem.h"
 #include "opcode.h"
 #include "tree.h"
 #include "hash.h"
diff --git a/tree.c b/tree.c
index c993e199..30e4d07c 100644
--- a/tree.c
+++ b/tree.c
@@ -3,12 +3,12 @@
 ** TecCGraf - PUC-Rio
 */
  
-char *rcs_tree="$Id: tree.c,v 1.22 1997/03/19 19:41:10 roberto Exp roberto $";
+char *rcs_tree="$Id: tree.c,v 1.23 1997/03/31 14:02:58 roberto Exp roberto $";
 
 
 #include <string.h>
 
-#include "mem.h"
+#include "luamem.h"
 #include "lua.h"
 #include "tree.h"
 #include "lex.h"