diff options
| author | shennetsind <ind@henn.et> | 2014-01-09 17:25:53 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-01-09 17:25:53 -0200 |
| commit | 56649bda4b2f62cf42847830546b5856234b3178 (patch) | |
| tree | 1ccf6f09b6620d95a177468bbee9cd0d428c1218 /3rdparty/libconfig | |
| parent | b79a9d7efa9213e3c791ec356bf21b712878d1aa (diff) | |
| parent | 763102b807239809d318add3fae5629bfd50a78b (diff) | |
| download | hercules-56649bda4b2f62cf42847830546b5856234b3178.tar.gz hercules-56649bda4b2f62cf42847830546b5856234b3178.tar.bz2 hercules-56649bda4b2f62cf42847830546b5856234b3178.tar.xz hercules-56649bda4b2f62cf42847830546b5856234b3178.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to '3rdparty/libconfig')
| -rw-r--r-- | 3rdparty/libconfig/extra/gen/scanner.l | 2 | ||||
| -rw-r--r-- | 3rdparty/libconfig/scanner.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/3rdparty/libconfig/extra/gen/scanner.l b/3rdparty/libconfig/extra/gen/scanner.l index 66364e019..bf527e596 100644 --- a/3rdparty/libconfig/extra/gen/scanner.l +++ b/3rdparty/libconfig/extra/gen/scanner.l @@ -89,7 +89,7 @@ static unsigned long long fromhex(const char *s) static int fromihex(const char *s) { unsigned long l = strtoul(s, NULL, 16); if (l > INT32_MAX) - l = INT32_MAX; + l &= INT32_MAX; return (int)l; } diff --git a/3rdparty/libconfig/scanner.c b/3rdparty/libconfig/scanner.c index c3a717ff0..44a7d69dd 100644 --- a/3rdparty/libconfig/scanner.c +++ b/3rdparty/libconfig/scanner.c @@ -628,7 +628,7 @@ static unsigned long long fromhex(const char *s) static int fromihex(const char *s) { unsigned long l = strtoul(s, NULL, 16); if (l > INT32_MAX) - l = INT32_MAX; + l &= INT32_MAX; return (int)l; } |