summaryrefslogtreecommitdiff
path: root/tools/ci/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'tools/ci/scripts')
-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" | \