mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-04 23:25:01 +02:00
lua: refresh host patches as well (#12303)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33715 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
fb480b73a7
commit
6c2e1bbd24
File diff suppressed because it is too large
Load Diff
@ -1,8 +1,6 @@
|
|||||||
Index: lua-5.1.3/src/lua.h
|
--- a/src/lua.h
|
||||||
===================================================================
|
+++ b/src/lua.h
|
||||||
--- lua-5.1.3.orig/src/lua.h 2008-06-29 11:45:55.000000000 +0200
|
@@ -79,7 +79,7 @@ typedef void * (*lua_Alloc) (void *ud, v
|
||||||
+++ lua-5.1.3/src/lua.h 2008-06-29 11:46:28.000000000 +0200
|
|
||||||
@@ -79,7 +79,7 @@
|
|
||||||
* not acceptable for 5.1, maybe 5.2 onwards?
|
* not acceptable for 5.1, maybe 5.2 onwards?
|
||||||
* 9: greater than existing (5.1) type values.
|
* 9: greater than existing (5.1) type values.
|
||||||
*/
|
*/
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
Index: lua-5.1.4/src/ldump.c
|
--- a/src/ldump.c
|
||||||
===================================================================
|
+++ b/src/ldump.c
|
||||||
--- lua-5.1.4.orig/src/ldump.c 2008-08-24 16:48:20.000000000 +0200
|
@@ -67,12 +67,12 @@ static void DumpString(const TString* s,
|
||||||
+++ lua-5.1.4/src/ldump.c 2008-08-24 16:48:52.000000000 +0200
|
|
||||||
@@ -67,12 +67,12 @@
|
|
||||||
{
|
{
|
||||||
if (s==NULL || getstr(s)==NULL)
|
if (s==NULL || getstr(s)==NULL)
|
||||||
{
|
{
|
||||||
@ -17,11 +15,9 @@ Index: lua-5.1.4/src/ldump.c
|
|||||||
DumpVar(size,D);
|
DumpVar(size,D);
|
||||||
DumpBlock(getstr(s),size,D);
|
DumpBlock(getstr(s),size,D);
|
||||||
}
|
}
|
||||||
Index: lua-5.1.4/src/lundump.c
|
--- a/src/lundump.c
|
||||||
===================================================================
|
+++ b/src/lundump.c
|
||||||
--- lua-5.1.4.orig/src/lundump.c 2008-08-24 16:48:20.000000000 +0200
|
@@ -25,6 +25,7 @@ typedef struct {
|
||||||
+++ lua-5.1.4/src/lundump.c 2008-08-24 16:48:52.000000000 +0200
|
|
||||||
@@ -25,6 +25,7 @@
|
|
||||||
ZIO* Z;
|
ZIO* Z;
|
||||||
Mbuffer* b;
|
Mbuffer* b;
|
||||||
const char* name;
|
const char* name;
|
||||||
@ -29,7 +25,7 @@ Index: lua-5.1.4/src/lundump.c
|
|||||||
} LoadState;
|
} LoadState;
|
||||||
|
|
||||||
#ifdef LUAC_TRUST_BINARIES
|
#ifdef LUAC_TRUST_BINARIES
|
||||||
@@ -40,7 +41,6 @@
|
@@ -40,7 +41,6 @@ static void error(LoadState* S, const ch
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -37,7 +33,7 @@ Index: lua-5.1.4/src/lundump.c
|
|||||||
#define LoadByte(S) (lu_byte)LoadChar(S)
|
#define LoadByte(S) (lu_byte)LoadChar(S)
|
||||||
#define LoadVar(S,x) LoadMem(S,&x,1,sizeof(x))
|
#define LoadVar(S,x) LoadMem(S,&x,1,sizeof(x))
|
||||||
#define LoadVector(S,b,n,size) LoadMem(S,b,n,size)
|
#define LoadVector(S,b,n,size) LoadMem(S,b,n,size)
|
||||||
@@ -51,6 +51,49 @@
|
@@ -51,6 +51,49 @@ static void LoadBlock(LoadState* S, void
|
||||||
IF (r!=0, "unexpected end");
|
IF (r!=0, "unexpected end");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -87,7 +83,7 @@ Index: lua-5.1.4/src/lundump.c
|
|||||||
static int LoadChar(LoadState* S)
|
static int LoadChar(LoadState* S)
|
||||||
{
|
{
|
||||||
char x;
|
char x;
|
||||||
@@ -82,7 +125,7 @@
|
@@ -82,7 +125,7 @@ static lua_Integer LoadInteger(LoadState
|
||||||
|
|
||||||
static TString* LoadString(LoadState* S)
|
static TString* LoadString(LoadState* S)
|
||||||
{
|
{
|
||||||
@ -96,7 +92,7 @@ Index: lua-5.1.4/src/lundump.c
|
|||||||
LoadVar(S,size);
|
LoadVar(S,size);
|
||||||
if (size==0)
|
if (size==0)
|
||||||
return NULL;
|
return NULL;
|
||||||
@@ -196,6 +239,7 @@
|
@@ -196,6 +239,7 @@ static void LoadHeader(LoadState* S)
|
||||||
char s[LUAC_HEADERSIZE];
|
char s[LUAC_HEADERSIZE];
|
||||||
luaU_header(h);
|
luaU_header(h);
|
||||||
LoadBlock(S,s,LUAC_HEADERSIZE);
|
LoadBlock(S,s,LUAC_HEADERSIZE);
|
||||||
@ -104,7 +100,7 @@ Index: lua-5.1.4/src/lundump.c
|
|||||||
IF (memcmp(h,s,LUAC_HEADERSIZE)!=0, "bad header");
|
IF (memcmp(h,s,LUAC_HEADERSIZE)!=0, "bad header");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -230,7 +274,7 @@
|
@@ -230,7 +274,7 @@ void luaU_header (char* h)
|
||||||
*h++=(char)LUAC_FORMAT;
|
*h++=(char)LUAC_FORMAT;
|
||||||
*h++=(char)*(char*)&x; /* endianness */
|
*h++=(char)*(char*)&x; /* endianness */
|
||||||
*h++=(char)sizeof(int);
|
*h++=(char)sizeof(int);
|
||||||
|
Loading…
Reference in New Issue
Block a user