aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>1997-03-31 11:19:01 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>1997-03-31 11:19:01 -0300
commit373363cb693b80c172534467e0458cea96c64f2a (patch)
tree80373e0a76dca8b776316c87ccf30fc77d5215db
parentad5574c4c97af3ef863a6fb4b72142f3780103b2 (diff)
downloadlua-373363cb693b80c172534467e0458cea96c64f2a.tar.gz
lua-373363cb693b80c172534467e0458cea96c64f2a.tar.bz2
lua-373363cb693b80c172534467e0458cea96c64f2a.zip
new name for old "mem.h" (conflicts with some compiler libraries)
-rw-r--r--fallback.c4
-rw-r--r--func.c2
-rw-r--r--hash.c4
-rw-r--r--inout.c4
-rw-r--r--lex.c4
-rw-r--r--lua.stx4
-rw-r--r--luamem.c4
-rw-r--r--luamem.h6
-rw-r--r--makefile26
-rw-r--r--opcode.c4
-rw-r--r--table.c4
-rw-r--r--tree.c4
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 @@
3** TecCGraf - PUC-Rio 3** TecCGraf - PUC-Rio
4*/ 4*/
5 5
6char *rcs_fallback="$Id: fallback.c,v 1.33 1997/03/24 17:13:22 roberto Exp roberto $"; 6char *rcs_fallback="$Id: fallback.c,v 1.34 1997/03/31 14:02:58 roberto Exp roberto $";
7 7
8#include <stdio.h> 8#include <stdio.h>
9#include <string.h> 9#include <string.h>
10 10
11#include "auxlib.h" 11#include "auxlib.h"
12#include "mem.h" 12#include "luamem.h"
13#include "fallback.h" 13#include "fallback.h"
14#include "opcode.h" 14#include "opcode.h"
15#include "lua.h" 15#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 @@
2 2
3#include "luadebug.h" 3#include "luadebug.h"
4#include "table.h" 4#include "table.h"
5#include "mem.h" 5#include "luamem.h"
6#include "func.h" 6#include "func.h"
7#include "opcode.h" 7#include "opcode.h"
8 8
diff --git a/hash.c b/hash.c
index 9e0170c4..801bf971 100644
--- a/hash.c
+++ b/hash.c
@@ -3,10 +3,10 @@
3** hash manager for lua 3** hash manager for lua
4*/ 4*/
5 5
6char *rcs_hash="$Id: hash.c,v 2.37 1997/03/21 18:52:37 roberto Exp roberto $"; 6char *rcs_hash="$Id: hash.c,v 2.38 1997/03/31 14:02:58 roberto Exp roberto $";
7 7
8 8
9#include "mem.h" 9#include "luamem.h"
10#include "opcode.h" 10#include "opcode.h"
11#include "hash.h" 11#include "hash.h"
12#include "table.h" 12#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 @@
5** Also provides some predefined lua functions. 5** Also provides some predefined lua functions.
6*/ 6*/
7 7
8char *rcs_inout="$Id: inout.c,v 2.47 1997/03/19 19:41:10 roberto Exp roberto $"; 8char *rcs_inout="$Id: inout.c,v 2.48 1997/03/20 19:20:23 roberto Exp roberto $";
9 9
10#include <stdio.h> 10#include <stdio.h>
11#include <string.h> 11#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 $";
18#include "tree.h" 18#include "tree.h"
19#include "lua.h" 19#include "lua.h"
20#include "hash.h" 20#include "hash.h"
21#include "mem.h" 21#include "luamem.h"
22#include "fallback.h" 22#include "fallback.h"
23 23
24 24
diff --git a/lex.c b/lex.c
index 76c48040..a019c6ef 100644
--- a/lex.c
+++ b/lex.c
@@ -1,11 +1,11 @@
1char *rcs_lex = "$Id: lex.c,v 2.42 1997/02/07 13:49:46 roberto Exp roberto $"; 1char *rcs_lex = "$Id: lex.c,v 2.43 1997/03/18 15:30:50 roberto Exp roberto $";
2 2
3 3
4#include <ctype.h> 4#include <ctype.h>
5#include <string.h> 5#include <string.h>
6 6
7#include "auxlib.h" 7#include "auxlib.h"
8#include "mem.h" 8#include "luamem.h"
9#include "tree.h" 9#include "tree.h"
10#include "table.h" 10#include "table.h"
11#include "lex.h" 11#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 @@
1%{ 1%{
2 2
3char *rcs_luastx = "$Id: lua.stx,v 3.44 1997/02/13 16:18:39 roberto Exp roberto $"; 3char *rcs_luastx = "$Id: lua.stx,v 3.45 1997/03/06 17:30:55 roberto Exp roberto $";
4 4
5#include <stdio.h> 5#include <stdio.h>
6#include <stdlib.h> 6#include <stdlib.h>
7#include <string.h> 7#include <string.h>
8 8
9#include "luadebug.h" 9#include "luadebug.h"
10#include "mem.h" 10#include "luamem.h"
11#include "lex.h" 11#include "lex.h"
12#include "opcode.h" 12#include "opcode.h"
13#include "hash.h" 13#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 @@
3** TecCGraf - PUC-Rio 3** TecCGraf - PUC-Rio
4*/ 4*/
5 5
6char *rcs_mem = "$Id: mem.c,v 1.14 1997/02/25 11:12:28 roberto Exp roberto $"; 6char *rcs_luamem = "$Id: mem.c,v 1.14 1997/03/03 19:55:38 roberto Exp roberto $";
7 7
8#include <stdlib.h> 8#include <stdlib.h>
9 9
10#include "mem.h" 10#include "luamem.h"
11#include "lua.h" 11#include "lua.h"
12 12
13 13
diff --git a/luamem.h b/luamem.h
index cbc973b2..e338183d 100644
--- a/luamem.h
+++ b/luamem.h
@@ -1,11 +1,11 @@
1/* 1/*
2** mem.c 2** mem.c
3** memory manager for lua 3** memory manager for lua
4** $Id: mem.h,v 1.7 1996/04/22 18:00:37 roberto Exp roberto $ 4** $Id: luamem.h,v 1.8 1996/05/24 14:31:10 roberto Exp roberto $
5*/ 5*/
6 6
7#ifndef mem_h 7#ifndef luamem_h
8#define mem_h 8#define luamem_h
9 9
10#ifndef NULL 10#ifndef NULL
11#define NULL 0 11#define NULL 0
diff --git a/makefile b/makefile
index 8e23fcdd..78f1a670 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
1# $Id: makefile,v 1.28 1997/03/05 13:37:04 roberto Exp roberto $ 1# $Id: makefile,v 1.29 1997/03/17 17:01:10 roberto Exp roberto $
2 2
3#configuration 3#configuration
4 4
@@ -28,7 +28,7 @@ LUAOBJS = \
28 inout.o \ 28 inout.o \
29 tree.o \ 29 tree.o \
30 fallback.o \ 30 fallback.o \
31 mem.o \ 31 luamem.o \
32 func.o \ 32 func.o \
33 undump.o \ 33 undump.o \
34 auxlib.o 34 auxlib.o
@@ -77,28 +77,28 @@ clear :
77 77
78 78
79auxlib.o: auxlib.c lua.h 79auxlib.o: auxlib.c lua.h
80fallback.o: fallback.c mem.h fallback.h lua.h opcode.h types.h tree.h \ 80fallback.o: fallback.c luamem.h fallback.h lua.h opcode.h types.h tree.h \
81 func.h table.h hash.h 81 func.h table.h hash.h
82func.o: func.c luadebug.h lua.h table.h tree.h types.h opcode.h func.h \ 82func.o: func.c luadebug.h lua.h table.h tree.h types.h opcode.h func.h \
83 mem.h 83 luamem.h
84hash.o: hash.c mem.h opcode.h lua.h types.h tree.h func.h hash.h \ 84hash.o: hash.c luamem.h opcode.h lua.h types.h tree.h func.h hash.h \
85 table.h 85 table.h
86inout.o: inout.c lex.h opcode.h lua.h types.h tree.h func.h inout.h \ 86inout.o: inout.c lex.h opcode.h lua.h types.h tree.h func.h inout.h \
87 table.h hash.h mem.h fallback.h 87 table.h hash.h luamem.h fallback.h
88iolib.o: iolib.c lua.h luadebug.h lualib.h 88iolib.o: iolib.c lua.h luadebug.h lualib.h
89lex.o: lex.c mem.h tree.h types.h table.h opcode.h lua.h func.h lex.h \ 89lex.o: lex.c luamem.h tree.h types.h table.h opcode.h lua.h func.h lex.h \
90 inout.h luadebug.h parser.h 90 inout.h luadebug.h parser.h
91lua.o: lua.c lua.h lualib.h 91lua.o: lua.c lua.h lualib.h
92mathlib.o: mathlib.c lualib.h lua.h 92mathlib.o: mathlib.c lualib.h lua.h
93mem.o: mem.c mem.h lua.h 93luamem.o: luamem.c luamem.h lua.h
94opcode.o: opcode.c luadebug.h lua.h mem.h opcode.h types.h tree.h \ 94opcode.o: opcode.c luadebug.h lua.h luamem.h opcode.h types.h tree.h \
95 func.h hash.h inout.h table.h fallback.h undump.h 95 func.h hash.h inout.h table.h fallback.h undump.h
96parser.o: parser.c luadebug.h lua.h mem.h lex.h opcode.h types.h \ 96parser.o: parser.c luadebug.h lua.h luamem.h lex.h opcode.h types.h \
97 tree.h func.h hash.h inout.h table.h 97 tree.h func.h hash.h inout.h table.h
98strlib.o: strlib.c lua.h lualib.h 98strlib.o: strlib.c lua.h lualib.h
99table.o: table.c mem.h opcode.h lua.h types.h tree.h func.h hash.h \ 99table.o: table.c luamem.h opcode.h lua.h types.h tree.h func.h hash.h \
100 table.h inout.h fallback.h luadebug.h 100 table.h inout.h fallback.h luadebug.h
101tree.o: tree.c mem.h lua.h tree.h types.h lex.h hash.h opcode.h func.h \ 101tree.o: tree.c luamem.h lua.h tree.h types.h lex.h hash.h opcode.h func.h \
102 table.h fallback.h 102 table.h fallback.h
103undump.o: undump.c opcode.h lua.h types.h tree.h func.h mem.h table.h \ 103undump.o: undump.c opcode.h lua.h types.h tree.h func.h luamem.h table.h \
104 undump.h 104 undump.h
diff --git a/opcode.c b/opcode.c
index 595277a9..67128d23 100644
--- a/opcode.c
+++ b/opcode.c
@@ -3,7 +3,7 @@
3** TecCGraf - PUC-Rio 3** TecCGraf - PUC-Rio
4*/ 4*/
5 5
6char *rcs_opcode="$Id: opcode.c,v 3.86 1997/03/20 19:20:43 roberto Exp roberto $"; 6char *rcs_opcode="$Id: opcode.c,v 3.87 1997/03/31 14:02:58 roberto Exp roberto $";
7 7
8#include <setjmp.h> 8#include <setjmp.h>
9#include <stdio.h> 9#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 $
11#include <stdlib.h> 11#include <stdlib.h>
12 12
13#include "luadebug.h" 13#include "luadebug.h"
14#include "mem.h" 14#include "luamem.h"
15#include "opcode.h" 15#include "opcode.h"
16#include "hash.h" 16#include "hash.h"
17#include "inout.h" 17#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 @@
3** Module to control static tables 3** Module to control static tables
4*/ 4*/
5 5
6char *rcs_table="$Id: table.c,v 2.63 1997/03/26 22:22:41 roberto Exp roberto $"; 6char *rcs_table="$Id: table.c,v 2.64 1997/03/31 14:02:58 roberto Exp roberto $";
7 7
8#include "mem.h" 8#include "luamem.h"
9#include "opcode.h" 9#include "opcode.h"
10#include "tree.h" 10#include "tree.h"
11#include "hash.h" 11#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 @@
3** TecCGraf - PUC-Rio 3** TecCGraf - PUC-Rio
4*/ 4*/
5 5
6char *rcs_tree="$Id: tree.c,v 1.22 1997/03/19 19:41:10 roberto Exp roberto $"; 6char *rcs_tree="$Id: tree.c,v 1.23 1997/03/31 14:02:58 roberto Exp roberto $";
7 7
8 8
9#include <string.h> 9#include <string.h>
10 10
11#include "mem.h" 11#include "luamem.h"
12#include "lua.h" 12#include "lua.h"
13#include "tree.h" 13#include "tree.h"
14#include "lex.h" 14#include "lex.h"