summaryrefslogtreecommitdiff
path: root/3rdparty
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-02-20 15:59:58 +0100
committerHaru <haru@dotalux.com>2016-02-20 15:59:58 +0100
commit71968e6985a2d6798505b84bc7ed22f5c6bfcfac (patch)
tree4740ae636d410980f379cc4bb3a969b49451c7c7 /3rdparty
parent5b74faa8afd04771af7acb918072ea71a3db475f (diff)
parentb7f772294594c40ef1e18f9c044e5c4fe6b490f4 (diff)
downloadhercules-71968e6985a2d6798505b84bc7ed22f5c6bfcfac.tar.gz
hercules-71968e6985a2d6798505b84bc7ed22f5c6bfcfac.tar.bz2
hercules-71968e6985a2d6798505b84bc7ed22f5c6bfcfac.tar.xz
hercules-71968e6985a2d6798505b84bc7ed22f5c6bfcfac.zip
Merge pull request #1162 from 4144/flags
Add some compiler warning flags and fix new warnings
Diffstat (limited to '3rdparty')
-rw-r--r--3rdparty/libconfig/libconfig.c6
-rw-r--r--3rdparty/mysql/include/my_global.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/3rdparty/libconfig/libconfig.c b/3rdparty/libconfig/libconfig.c
index 0942241c2..696f5fc08 100644
--- a/3rdparty/libconfig/libconfig.c
+++ b/3rdparty/libconfig/libconfig.c
@@ -192,7 +192,7 @@ static void __config_write_value(const struct config_t *config,
switch(format)
{
case CONFIG_FORMAT_HEX:
- fprintf(stream, "0x%X", value->ival);
+ fprintf(stream, "0x%X", (unsigned int)(value->ival));
break;
case CONFIG_FORMAT_DEFAULT:
@@ -207,7 +207,7 @@ static void __config_write_value(const struct config_t *config,
switch(format)
{
case CONFIG_FORMAT_HEX:
- fprintf(stream, "0x" INT64_HEX_FMT "L", value->llval);
+ fprintf(stream, "0x" INT64_HEX_FMT "L", (unsigned long long)(value->llval));
break;
case CONFIG_FORMAT_DEFAULT:
@@ -291,7 +291,7 @@ static void __config_write_value(const struct config_t *config,
if(c >= ' ')
fputc(c, stream);
else
- fprintf(stream, "\\x%02X", c);
+ fprintf(stream, "\\x%02X", (unsigned int)(c));
}
}
}
diff --git a/3rdparty/mysql/include/my_global.h b/3rdparty/mysql/include/my_global.h
index 2417477e2..8e4287c19 100644
--- a/3rdparty/mysql/include/my_global.h
+++ b/3rdparty/mysql/include/my_global.h
@@ -93,7 +93,7 @@
#define NETWARE_SET_SCREEN_MODE(A)
#endif
-#include "../common/strlib.h"
+#include "common/strlib.h"
/*
The macros below are borrowed from include/linux/compiler.h in the