Author: luka Date: 2016-05-11 00:36:45 +0200 (Wed, 11 May 2016) New Revision: 49338
Modified: trunk/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch Log: xtables-addons: Avoid redefinition of SHRT_MAX in lua packet script Patch Lua packet script defines SHRT_MAX which is already defined in <linux/kernel.h> and is included indirectly by lauxlib.h. Fix the redefintion as it leads to compile failure on systems which treat macro redefinition as an error Signed-off-by: Hans Dedecker <[email protected]> Modified: trunk/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch =================================================================== --- trunk/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch 2016-05-10 22:36:44 UTC (rev 49337) +++ trunk/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch 2016-05-10 22:36:45 UTC (rev 49338) @@ -82,17 +82,20 @@ #define ltable_c --- a/extensions/LUA/lua/luaconf.h +++ b/extensions/LUA/lua/luaconf.h -@@ -13,6 +13,10 @@ +@@ -13,8 +13,12 @@ #if !defined(__KERNEL__) #include <limits.h> #else ++#include <linux/kernel.h> ++ +#undef UCHAR_MAX -+#undef SHRT_MAX +#undef BUFSIZ +#undef NO_FPU #define UCHAR_MAX 255 - #define SHRT_MAX 32767 +-#define SHRT_MAX 32767 #define BUFSIZ 8192 + #define NO_FPU + #endif @@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l; */ #if defined(__KERNEL__) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
