diff options
| author | Hans Dedecker <dedeckeh@gmail.com> | 2016-05-02 11:57:59 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2016-05-02 18:28:01 +0100 |
| commit | 6a06cd833187f09fdb4dd9b5ee169791fbde6047 (patch) | |
| tree | f4b5d94f9281a7d4132207da75227943c677de82 | |
| parent | a6f76bffd89add05a545faf95bcef63dad02f8bc (diff) | |
| download | upstream-6a06cd833187f09fdb4dd9b5ee169791fbde6047.tar.gz upstream-6a06cd833187f09fdb4dd9b5ee169791fbde6047.tar.bz2 upstream-6a06cd833187f09fdb4dd9b5ee169791fbde6047.zip | |
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 <dedeckeh@gmail.com>
| -rw-r--r-- | package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch b/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch index ebc952bca3..02250ec206 100644 --- a/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch +++ b/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch @@ -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__) |