From: Felix Fietkau <nbd@nbd.name>
Date: Tue, 7 Mar 2017 08:18:18 +0000 (+0100)
Subject: xtables-addons: fix build error on ARC
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=055e9dfb580c3d5f36a98dd9c27ff284288676a6;p=openwrt%2Fstaging%2Fflorian.git

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>
---

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
+