diff --git a/llimits.h b/llimits.h index b704f527..7cf2048b 100644 --- a/llimits.h +++ b/llimits.h @@ -1,5 +1,5 @@ /* -** $Id: llimits.h,v 1.93 2011/10/07 20:45:19 roberto Exp roberto $ +** $Id: llimits.h,v 1.94 2011/11/29 15:39:48 roberto Exp roberto $ ** Limits, basic types, and some other `installation-dependent' definitions ** See Copyright Notice in lua.h */ @@ -269,7 +269,7 @@ union luai_Cast { double l_d; LUA_INT32 l_p[2]; }; -#if (defined(ltable_c) || defined(luaall_c)) && !defined(luai_hashnum) +#if defined(ltable_c) && !defined(luai_hashnum) #include #include diff --git a/luaconf.h b/luaconf.h index 1ab2ec18..d58bd4cc 100644 --- a/luaconf.h +++ b/luaconf.h @@ -1,5 +1,5 @@ /* -** $Id: luaconf.h,v 1.168 2011/11/29 17:15:42 roberto Exp roberto $ +** $Id: luaconf.h,v 1.169 2011/11/30 12:35:05 roberto Exp roberto $ ** Configuration file for Lua ** See Copyright Notice in lua.h */ @@ -174,13 +174,8 @@ ** give a warning about it. To avoid these warnings, change to the ** default definition. */ -#if defined(luaall_c) /* { */ -#define LUAI_FUNC static -#define LUAI_DDEC static -#define LUAI_DDEF static - -#elif defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ - defined(__ELF__) +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ + defined(__ELF__) /* { */ #define LUAI_FUNC __attribute__((visibility("hidden"))) extern #define LUAI_DDEC LUAI_FUNC #define LUAI_DDEF /* empty */ @@ -214,7 +209,7 @@ ** They are only used in libraries and the stand-alone program. (The #if ** avoids including 'stdio.h' everywhere.) */ -#if defined(LUA_LIB) || defined(lua_c) || defined(luaall_c) +#if defined(LUA_LIB) || defined(lua_c) #include #define luai_writestring(s,l) fwrite((s), sizeof(char), (l), stdout) #define luai_writeline() (luai_writestring("\n", 1), fflush(stdout)) @@ -423,7 +418,7 @@ */ /* the following operations need the math library */ -#if defined(lobject_c) || defined(lvm_c) || defined(luaall_c) +#if defined(lobject_c) || defined(lvm_c) #include #define luai_nummod(L,a,b) ((a) - floor((a)/(b))*(b)) #define luai_numpow(L,a,b) (pow(a,b))