From: Felipe Pena <felipe@php.net>
Date: Fri, 20 May 2011 21:24:51 +0000 (+0000)
Subject: - Fixed bug #54895 (Fix compiling with older gcc version without need for membar_prod... 
X-Git-Tag: php-5.3.7RC1~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7e6e6cedfc506457e941dc58084f5745e3af4c8;p=php

- Fixed bug #54895 (Fix compiling with older gcc version without need for membar_producer macro)
  patch by: mhei at heimpold dot de
---

diff --git a/NEWS b/NEWS
index cfec4639ab..405d763abf 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,8 @@ PHP                                                                        NEWS
   . Implemented FR #54459 (Range function accuracy). (Adam)
   . Added PHP_MANDIR constant telling where the manpages were installed into,
     and an --man-dir argument to php-config. (Hannes)
+  . Fixed bug #54895 (Fix compiling with older gcc version without need for
+    membar_producer macro). (mhei at heimpold dot de)
   . Fixed bug #54723 (getimagesize() doesn't check the full ico signature).
     (Scott)
   . Fixed bug #54580 (get_browser() segmentation fault when browscap ini
diff --git a/ext/standard/php_crypt_r.c b/ext/standard/php_crypt_r.c
index c6700d6618..d263269537 100644
--- a/ext/standard/php_crypt_r.c
+++ b/ext/standard/php_crypt_r.c
@@ -94,7 +94,7 @@ void _crypt_extended_init_r(void)
 	if (!initialized) {
 #ifdef PHP_WIN32
 		InterlockedIncrement(&initialized);
-#elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2))
+#elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR__ >= 1))
 		__sync_fetch_and_add(&initialized, 1);
 #elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */
 		membar_producer();