svn: /php/php-src/ branches/PHP_5_2/Zend/zend.h branches/PHP_5_3/Zend/zend.h trunk/Zend/zend.h
| From: | Rasmus Lerdorf | Date: | Fri, 15 Jan 2010 18:26:53 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/Zend/zend.h branches/PHP_5_3/Zend/zend.h trunk/Zend/zend.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-61556@lists.php.net to get a copy of this message | ||
rasmus Fri, 15 Jan 2010 18:26:53 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=293590
Log:
Fix gcc version check - bug #50771
Bug: http://bugs.php.net/50771 (Open) ZEND_GCC_VERSION is
incorrectly defined
Changed paths:
U php/php-src/branches/PHP_5_2/Zend/zend.h
U php/php-src/branches/PHP_5_3/Zend/zend.h
U php/php-src/trunk/Zend/zend.h
Modified: php/php-src/branches/PHP_5_2/Zend/zend.h
===================================================================
--- php/php-src/branches/PHP_5_2/Zend/zend.h 2010-01-15 17:24:07 UTC (rev 293589)
+++ php/php-src/branches/PHP_5_2/Zend/zend.h 2010-01-15 18:26:53 UTC (rev 293590)
@@ -178,7 +178,7 @@
#endif
-#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3400
+#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004
#else
# define __restrict__
#endif
Modified: php/php-src/branches/PHP_5_3/Zend/zend.h
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend.h 2010-01-15 17:24:07 UTC (rev 293589)
+++ php/php-src/branches/PHP_5_3/Zend/zend.h 2010-01-15 18:26:53 UTC (rev 293590)
@@ -166,7 +166,7 @@
# define ZEND_ATTRIBUTE_DEPRECATED
#endif
-#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3400 && defined(__i386__)
+#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004 && defined(__i386__)
# define ZEND_FASTCALL __attribute__((fastcall))
#elif defined(_MSC_VER) && defined(_M_IX86)
# define ZEND_FASTCALL __fastcall
@@ -174,7 +174,7 @@
# define ZEND_FASTCALL
#endif
-#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3400
+#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004
#else
# define __restrict__
#endif
Modified: php/php-src/trunk/Zend/zend.h
===================================================================
--- php/php-src/trunk/Zend/zend.h 2010-01-15 17:24:07 UTC (rev 293589)
+++ php/php-src/trunk/Zend/zend.h 2010-01-15 18:26:53 UTC (rev 293590)
@@ -167,7 +167,7 @@
# define ZEND_ATTRIBUTE_DEPRECATED
#endif
-#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3400 && defined(__i386__)
+#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004 && defined(__i386__)
# define ZEND_FASTCALL __attribute__((fastcall))
#elif defined(_MSC_VER) && defined(_M_IX86)
# define ZEND_FASTCALL __fastcall
@@ -175,7 +175,7 @@
# define ZEND_FASTCALL
#endif
-#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3400
+#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004
#else
# define __restrict__
#endif