cvs: ZendEngine2(PHP_5_2) / zend.c

rasmus		Tue Jun 16 16:09:04 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /ZendEngine2	zend.c 
  Log:
  Another tweak to make 5.2 compile on gcc2
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.38&r2=1.308.2.12.2.39&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.308.2.12.2.38 ZendEngine2/zend.c:1.308.2.12.2.39
--- ZendEngine2/zend.c:1.308.2.12.2.38	Thu May 14 18:34:26 2009
+++ ZendEngine2/zend.c	Tue Jun 16 16:09:04 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend.c,v 1.308.2.12.2.38 2009/05/14 18:34:26 jani Exp $ */
+/* $Id: zend.c,v 1.308.2.12.2.39 2009/06/16 16:09:04 rasmus Exp $ */
 
 #include "zend.h"
 #include "zend_extensions.h"
@@ -1078,7 +1078,7 @@
 	}
 }
 
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)
+#if defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)
 void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((alias("zend_error"),noreturn));
 #endif