From ab4f02b91084e25c260b6beb4fa4324cfbeda3de Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 10 Jul 2018 16:21:38 +0200 Subject: [SERVER] Fix compilation on clang (atomic vars) --- src/server/globals.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/globals.c b/src/server/globals.c index ee4de19..c9b9411 100644 --- a/src/server/globals.c +++ b/src/server/globals.c @@ -236,7 +236,7 @@ static bool parse64(const char *in, atomic_int_fast64_t *out, const char *optnam } } while ( exp-- > 0 ) num *= base; - *out = (atomic_int_fast64_t)num; + *out = (int64_t)num; return true; } @@ -248,7 +248,7 @@ static bool parse64u(const char *in, atomic_uint_fast64_t *out, const char *optn logadd( LOG_WARNING, "Ignoring value '%s' for '%s': Cannot be negative", in, optname ); return false; } - *out = (atomic_uint_fast64_t)v; + *out = (uint64_t)v; return true; } @@ -260,7 +260,7 @@ static bool parse32(const char *in, atomic_int *out, const char *optname) logadd( LOG_WARNING, "'%s' must be between %d and %d, but is '%s'", optname, (int)INT_MIN, (int)INT_MAX, in ); return false; } - *out = (atomic_int)v; + *out = (int)v; return true; } @@ -272,7 +272,7 @@ static bool parse32u(const char *in, atomic_int *out, const char *optname) logadd( LOG_WARNING, "'%s' must be between %d and %d, but is '%s'", optname, (int)0, (int)INT_MAX, in ); return false; } - *out = (atomic_int)v; + *out = (int)v; return true; } -- cgit v1.2.3-55-g7522