summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLua Team <team@lua.org>2006-02-21 12:00:00 +0000
committerrepogen <>2006-02-21 12:00:00 +0000
commitf6f9af6cbce3516054b6fd2a8e9d3a1b168ce4be (patch)
tree445f56eafe5b8b782287fca4ca4197ba4970d322 /src
parent69c6ee1f592c6588bc11a8e02811230e77e984cf (diff)
downloadlua-github-5.1.tar.gz
Lua 5.15.1
Diffstat (limited to 'src')
-rw-r--r--src/Makefile7
-rw-r--r--src/ldump.c4
-rw-r--r--src/lundump.c4
3 files changed, 9 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile
index fb69ce1e..1d46d342 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,7 +20,7 @@ MYLIBS=
# == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
-PLATS= ansi bsd generic linux macosx mingw posix solaris
+PLATS= aix ansi bsd generic linux macosx mingw posix solaris
LUA_A= liblua.a
CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
@@ -79,6 +79,9 @@ echo:
none:
@echo "Please choose a platform: $(PLATS)"
+aix:
+ $(MAKE) all CC="xlc" CFLAGS="-O2" MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl" MYLDFLAGS="-brtl -bexpall"
+
ansi:
$(MAKE) all MYCFLAGS=-DLUA_ANSI
@@ -108,7 +111,7 @@ solaris:
$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl"
# list targets that do not create files (but not all makes understand .PHONY)
-.PHONY: all $(PLATS) default o a clean depend echo none
+.PHONY: all $(PLATS) default o a clean depend echo none
# DO NOT DELETE
diff --git a/src/ldump.c b/src/ldump.c
index 73463410..f08277d3 100644
--- a/src/ldump.c
+++ b/src/ldump.c
@@ -1,5 +1,5 @@
/*
-** $Id: ldump.c,v 1.14 2005/11/11 14:03:13 lhf Exp $
+** $Id: ldump.c,v 1.15 2006/02/16 15:53:49 lhf Exp $
** save precompiled Lua chunks
** See Copyright Notice in lua.h
*/
@@ -128,7 +128,7 @@ static void DumpDebug(const Proto* f, DumpState* D)
static void DumpFunction(const Proto* f, const TString* p, DumpState* D)
{
- DumpString((f->source==p) ? NULL : f->source,D);
+ DumpString((f->source==p || D->strip) ? NULL : f->source,D);
DumpInt(f->linedefined,D);
DumpInt(f->lastlinedefined,D);
DumpChar(f->nups,D);
diff --git a/src/lundump.c b/src/lundump.c
index 60a0eeed..7fc635ee 100644
--- a/src/lundump.c
+++ b/src/lundump.c
@@ -1,5 +1,5 @@
/*
-** $Id: lundump.c,v 1.59 2005/11/11 14:03:13 lhf Exp $
+** $Id: lundump.c,v 1.60 2006/02/16 15:53:49 lhf Exp $
** load precompiled Lua chunks
** See Copyright Notice in lua.h
*/
@@ -201,7 +201,7 @@ Proto* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name)
S.Z=Z;
S.b=buff;
LoadHeader(&S);
- return LoadFunction(&S,NULL);
+ return LoadFunction(&S,luaS_newliteral(L,"=?"));
}
/*