svn: /php/php-src/ branches/PHP_5_3/ext/standard/php_crypt_r.c branches/PHP_5_4/ext/standard/php_crypt_r.c trunk/ext/standard/php_crypt_r.c
| From: | Felipe Pena | Date: | Tue, 19 Jul 2011 22:12:13 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/standard/php_crypt_r.c branches/PHP_5_4/ext/standard/php_crypt_r.c trunk/ext/standard/php_crypt_r.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65539@lists.php.net to get a copy of this message | ||
felipe Tue, 19 Jul 2011 22:12:13 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=313452
Log:
- Fixed bug #55231 (Unsatisfied symbols __sync_fetch_and_add_4)
Bug: https://bugs.php.net/55231 (Feedback) Unsatisfied
symbols __sync_fetch_and_add_4
Changed paths:
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/ext/standard/php_crypt_r.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c 2011-07-19 21:40:09 UTC (rev 313451)
+++ php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c 2011-07-19 22:12:13 UTC (rev 313452)
@@ -94,7 +94,8 @@
if (!initialized) {
#ifdef PHP_WIN32
InterlockedIncrement(&initialized);
-#elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR__ >= 1))
+#elif (defined(__GNUC__) && (__GNUC__ > 4 || \
+ (__GNUC__ == 4 && (__GNUC_MINOR__ > 1 || (__GNUC_MINOR__ == 1 &&
__GNUC_PATCHLEVEL__ > 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-07-19 21:40:09 UTC (rev 313451)
+++ php/php-src/branches/PHP_5_4/ext/standard/php_crypt_r.c 2011-07-19 22:12:13 UTC (rev 313452)
@@ -94,7 +94,8 @@
if (!initialized) {
#ifdef PHP_WIN32
InterlockedIncrement(&initialized);
-#elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR__ >= 1))
+#elif (defined(__GNUC__) && (__GNUC__ > 4 || \
+ (__GNUC__ == 4 && (__GNUC_MINOR__ > 1 || (__GNUC_MINOR__ == 1 &&
__GNUC_PATCHLEVEL__ > 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-07-19 21:40:09 UTC (rev 313451)
+++ php/php-src/trunk/ext/standard/php_crypt_r.c 2011-07-19 22:12:13 UTC (rev 313452)
@@ -94,7 +94,8 @@
if (!initialized) {
#ifdef PHP_WIN32
InterlockedIncrement(&initialized);
-#elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR__ >= 1))
+#elif (defined(__GNUC__) && (__GNUC__ > 4 || \
+ (__GNUC__ == 4 && (__GNUC_MINOR__ > 1 || (__GNUC_MINOR__ == 1 &&
__GNUC_PATCHLEVEL__ > 1)))))
__sync_fetch_and_add(&initialized, 1);
#elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */
membar_producer();