summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-15 19:41:28 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-15 19:41:28 +0300
commit7639db8cec67fde349e41076738336a9d6ebe55d (patch)
tree40f74162f2ffd2ac8cabf3dad2277aafa1f8a4c7
parentf06424172d147bc444cf4f0c95ff3d92864d5f88 (diff)
downloadmv-7639db8cec67fde349e41076738336a9d6ebe55d.tar.gz
mv-7639db8cec67fde349e41076738336a9d6ebe55d.tar.bz2
mv-7639db8cec67fde349e41076738336a9d6ebe55d.tar.xz
mv-7639db8cec67fde349e41076738336a9d6ebe55d.zip
Fix compilation with gcc 4.4 and add exception into deheader script.
-rw-r--r--src/resources/map/map.cpp2
-rwxr-xr-xtools/ci/jobs/deheader2.sh1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index e0454ea8c..e86c0c2a4 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -69,9 +69,7 @@
#include <sys/stat.h>
-#ifdef ENABLE_PUGIXML
#include <climits>
-#endif // ENABLE_LIBXML
#include "debug.h"
diff --git a/tools/ci/jobs/deheader2.sh b/tools/ci/jobs/deheader2.sh
index f355760ad..ced2aeea7 100755
--- a/tools/ci/jobs/deheader2.sh
+++ b/tools/ci/jobs/deheader2.sh
@@ -22,6 +22,7 @@ grep "deheader:" ${LOGFILE} \
| grep -v "deheader: remove <linux/tcp.h> from ./src/net/sdltcpnet.cpp" \
| grep -v "deheader: remove <netdb.h> from ./src/net/sdltcpnet.cpp" \
| grep -v "deheader: remove <netinet/in.h> from ./src/net/sdltcpnet.cpp" \
+| grep -v "deheader: remove <climits> from ./src/resources/map/map.cpp" \
| grep -v "deheader: remove <climits> from ./src/units.cpp" > ${LOGFILE2}
export DATA=$(cat ${LOGFILE2})