summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-05-16 21:33:16 +0300
committerAndrei Karas <akaras@inbox.ru>2019-05-16 21:33:16 +0300
commit94d4fe5188170cd6e915155f8dbc86966da95c37 (patch)
treead3571629e6b7c082c5aa3cd8e2fe1e31c150bfc
parent7ce2492431e563a9fe6357b0faac344a78b36d33 (diff)
downloadplus-94d4fe5188170cd6e915155f8dbc86966da95c37.tar.gz
plus-94d4fe5188170cd6e915155f8dbc86966da95c37.tar.bz2
plus-94d4fe5188170cd6e915155f8dbc86966da95c37.tar.xz
plus-94d4fe5188170cd6e915155f8dbc86966da95c37.zip
fix libxml issue in deheader
-rwxr-xr-xtools/ci/scripts/deheader.sh2
-rwxr-xr-xtools/ci/scripts/deheaderS.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/ci/scripts/deheader.sh b/tools/ci/scripts/deheader.sh
index 285ecc1e0..619acc1c0 100755
--- a/tools/ci/scripts/deheader.sh
+++ b/tools/ci/scripts/deheader.sh
@@ -32,7 +32,7 @@ ${dir}/deheader -q -i "\"debug.h\"" \
-c "$CXX" \
-d "$FLAGS" \
-s "-std=gnu++1z" \
--m "-c -Werror -Wall -Wextra -Wundef -Wmissing-declarations -DLOCALEDIR=\\\"\\\" -I/usr/include $INCLUDES -I${dir}/src" $1 2>&1 | \
+-m "-c -Werror -Wall -Wextra -Wundef -Wmissing-declarations -DUCHAR_TYPE=uint16_t -DLOCALEDIR=\\\"\\\" -I/usr/include $INCLUDES -I${dir}/src" $1 2>&1 | \
grep -v "deheader: ./src/net/sdltcpnet.cpp has more than one inclusion of <netinet/tcp.h>" | \
grep -v "deheader: remove <netinet/tcp.h> from ./src/net/sdltcpnet.cpp" | \
grep -v "deheader: remove <climits> from ./src/resources/db/unitsdb.cpp" | \
diff --git a/tools/ci/scripts/deheaderS.sh b/tools/ci/scripts/deheaderS.sh
index c97e5a1da..8b76214f2 100755
--- a/tools/ci/scripts/deheaderS.sh
+++ b/tools/ci/scripts/deheaderS.sh
@@ -33,7 +33,7 @@ ${dir}/deheader -q -i "\"debug.h\"" \
-d "$FLAGS" \
-s "-std=gnu++1z" \
-S "-std=gnu++1z" \
--m "-c -Werror -Wall -Wextra -Wundef -Wmissing-declarations -DLOCALEDIR=\\\"\\\" -I/usr/include $INCLUDES -I${dir}/src" $1 2>&1 | \
+-m "-c -Werror -Wall -Wextra -Wundef -Wmissing-declarations -DUCHAR_TYPE=uint16_t -DLOCALEDIR=\\\"\\\" -I/usr/include $INCLUDES -I${dir}/src" $1 2>&1 | \
grep -v "deheader: ./src/net/sdltcpnet.cpp has more than one inclusion of <netinet/tcp.h>" | \
grep -v "deheader: remove <netinet/tcp.h> from ./src/net/sdltcpnet.cpp" | \
grep -v "deheader: remove <climits> from ./src/resources/db/unitsdb.cpp" | \