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>

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 ebc952bca360ada43dcd596f3c19e24e3cff3d18..02250ec206bfb89b8036694e44012592774538a5 100644 (file)
--- 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
  #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
  #if !defined(__KERNEL__)
  #include <limits.h>
  #else

++#include <linux/kernel.h>
++

 +#undef UCHAR_MAX
 +#undef UCHAR_MAX

-+#undef SHRT_MAX

 +#undef BUFSIZ
 +#undef NO_FPU
  #define UCHAR_MAX     255
 +#undef BUFSIZ
 +#undef NO_FPU
  #define UCHAR_MAX     255

- #define SHRT_MAX        32767
+-#define SHRT_MAX        32767

  #define BUFSIZ                8192
  #define BUFSIZ                8192

+ #define NO_FPU
+ #endif

 @@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l;
  */
  #if defined(__KERNEL__)
 @@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l;
  */
  #if defined(__KERNEL__)