Parcourir la source

Fix #230: Fix all GCC version checks this time.

Check GNUC > 4 according to Red54 (the original author of patch #230).
bel il y a 9 ans
Parent
commit
31c19f74a5
1 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. 2 2
      src/civetweb.c

+ 2 - 2
src/civetweb.c

@@ -1254,7 +1254,7 @@ mg_atomic_inc(volatile int *addr)
 	 * so whatever you use, the other SDK is likely to raise a warning. */
 	 * so whatever you use, the other SDK is likely to raise a warning. */
 	ret = InterlockedIncrement((volatile long *)addr);
 	ret = InterlockedIncrement((volatile long *)addr);
 #elif defined(__GNUC__)                                                        \
 #elif defined(__GNUC__)                                                        \
-    && (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ > 0))
+    && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 0)))
 	ret = __sync_add_and_fetch(addr, 1);
 	ret = __sync_add_and_fetch(addr, 1);
 #else
 #else
 	ret = (++(*addr));
 	ret = (++(*addr));
@@ -1272,7 +1272,7 @@ mg_atomic_dec(volatile int *addr)
 	 * so whatever you use, the other SDK is likely to raise a warning. */
 	 * so whatever you use, the other SDK is likely to raise a warning. */
 	ret = InterlockedDecrement((volatile long *)addr);
 	ret = InterlockedDecrement((volatile long *)addr);
 #elif defined(__GNUC__)                                                        \
 #elif defined(__GNUC__)                                                        \
-    && (__GNUC__ > 5 || (__GNUC__ == 4 && __GNUC_MINOR__ > 0))
+    && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 0)))
 	ret = __sync_sub_and_fetch(addr, 1);
 	ret = __sync_sub_and_fetch(addr, 1);
 #else
 #else
 	ret = (--(*addr));
 	ret = (--(*addr));