johannes                                 Wed, 10 Feb 2010 13:46:39 +0000

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

Log:
merge 294847: fix config test (johannes)

Changed paths:
    U   php/php-src/branches/PHP_5_3_2/ext/standard/config.m4

Modified: php/php-src/branches/PHP_5_3_2/ext/standard/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3_2/ext/standard/config.m4       2010-02-10 
13:37:17 UTC (rev 294847)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/config.m4       2010-02-10 
13:46:39 UTC (rev 294848)
@@ -239,13 +239,11 @@
   dnl
   dnl Check for __alignof__ support in the compiler
   dnl
-  AC_CACHE_CHECK(whether the compiler supports 
__alignof__,ac_cv_alignof_exists,[
+  AC_CACHE_CHECK(whether the compiler supports __alignof__, 
ac_cv_alignof_exists,[
   AC_TRY_COMPILE([
-int main() {
-       int align = __alignof__(int);
-       return 0;
-}
   ],[
+    int align = __alignof__(int);
+  ],[
     ac_cv_alignof_exists=yes
   ],[
     ac_cv_alignof_exists=no
@@ -257,8 +255,9 @@
   dnl
   dnl Check for __attribute__ ((__aligned__)) support in the compiler
   dnl
-  AC_CACHE_CHECK(whether the compiler supports aligned 
attribute,ac_cv_attribute_aligned,[
+  AC_CACHE_CHECK(whether the compiler supports aligned attribute, 
ac_cv_attribute_aligned,[
   AC_TRY_COMPILE([
+  ],[
     unsigned char test[32] __attribute__ ((__aligned__ (__alignof__ (int))));
   ],[
     ac_cv_attribute_aligned=yes
@@ -266,7 +265,7 @@
     ac_cv_attribute_aligned=no
   ])])
   if test "$ac_cv_attribute_aligned" = "yes"; then
-    AC_DEFINE([HAVE_ATTRIBUTE_ALIGNED], 1, [wheter the compiler supports 
__attribute__ ((__aligned__))])
+    AC_DEFINE([HAVE_ATTRIBUTE_ALIGNED], 1, [Wheter the compiler supports 
__attribute__ ((__aligned__))])
   fi



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

Reply via email to