Patch fpm_atomic_h_fix.patch for Compile Failure Bug #52407

Patch version 2010-07-22 15:20 UTC

Obsoleted by patches:

• fpm_atomic_h_fix.patch, revision 2010-07-24 12:36 UTC

• 2010-07-24 12:36 UTC [diff to current]
• 2010-07-22 15:20 UTC [diff to current]

Developer: eugenesan@gmail.com

--- php.orig/sapi/fpm/fpm/fpm_atomic.h	2010-07-13 09:02:20.000000000 +0300
+++ php/fpm/fpm/fpm_atomic.h	2010-07-13 16:27:37.143621901 +0300
@@ -65,9 +65,7 @@
 }
 /* }}} */
 
-#if (__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))
-
-#elif ( __arm__ || __arm ) /* W-Mark Kubacki */
+#elif ( (__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ > 2) && ( __arm__ || __arm ) )/* W-Mark Kubacki */
 
 #if (__arch64__ || __arch64)
 typedef int64_t                     atomic_int_t;
@@ -77,9 +75,9 @@
 typedef uint32_t                    atomic_uint_t;
 #endif
 
-#define atomic_cmp_set(a,b,c) __sync_bool_compare_and_swap(a,b,c)
+typedef volatile atomic_uint_t      atomic_t;
 
-#endif /* defined (__GNUC__) &&... */
+#define atomic_cmp_set(a,b,c) __sync_bool_compare_and_swap(a,b,c)
 
 #elif ( __sparc__ || __sparc ) /* Marcin Ochab */