diff options
author | Felix Fietkau <nbd@nbd.name> | 2017-03-07 09:18:18 +0100 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2017-03-12 15:06:50 +0100 |
commit | 055e9dfb580c3d5f36a98dd9c27ff284288676a6 (patch) | |
tree | e1c4b5483fc7da61e8a4f7dae37c66c20f745e7c /package/network/utils | |
parent | 2cf00b640dce3ee9b09b41f2f1486a6a50bca45b (diff) | |
download | upstream-055e9dfb580c3d5f36a98dd9c27ff284288676a6.tar.gz upstream-055e9dfb580c3d5f36a98dd9c27ff284288676a6.tar.bz2 upstream-055e9dfb580c3d5f36a98dd9c27ff284288676a6.zip |
xtables-addons: fix build error on ARC
The kernel unconditionally pulls in a header file that defines
'current', which conflicts with the lua extension code.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/network/utils')
-rw-r--r-- | package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch | 11 |
1 files changed, 11 insertions, 0 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 02250ec206..7599684bdb 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 @@ -105,3 +105,14 @@ #endif #if defined(__cplusplus) +--- a/extensions/LUA/lua/llex.h ++++ b/extensions/LUA/lua/llex.h +@@ -10,6 +10,8 @@ + #include "lobject.h" + #include "lzio.h" + ++/* prevent conflict with definition from asm/current.h */ ++#undef current + + #define FIRST_RESERVED 257 + |