felipe                                   Fri, 20 May 2011 21:24:51 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=311300

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

Bug: http://bugs.php.net/54895 (Open) Fix compiling with older gcc version 
without need for membar_producer macro
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c
    U   php/php-src/branches/PHP_5_4/ext/standard/php_crypt_r.c
    U   php/php-src/trunk/ext/standard/php_crypt_r.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2011-05-20 18:56:13 UTC (rev 311299)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-05-20 21:24:51 UTC (rev 311300)
@@ -24,6 +24,8 @@
   . 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

Modified: php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c     2011-05-20 
18:56:13 UTC (rev 311299)
+++ php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c     2011-05-20 
21:24:51 UTC (rev 311300)
@@ -94,7 +94,7 @@
        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();

Modified: php/php-src/branches/PHP_5_4/ext/standard/php_crypt_r.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/php_crypt_r.c     2011-05-20 
18:56:13 UTC (rev 311299)
+++ php/php-src/branches/PHP_5_4/ext/standard/php_crypt_r.c     2011-05-20 
21:24:51 UTC (rev 311300)
@@ -94,7 +94,7 @@
        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();

Modified: php/php-src/trunk/ext/standard/php_crypt_r.c
===================================================================
--- php/php-src/trunk/ext/standard/php_crypt_r.c        2011-05-20 18:56:13 UTC 
(rev 311299)
+++ php/php-src/trunk/ext/standard/php_crypt_r.c        2011-05-20 21:24:51 UTC 
(rev 311300)
@@ -94,7 +94,7 @@
        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();

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to