andrey                                   Tue, 25 Aug 2009 14:14:23 +0000

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

Log:
Fix bug#48198 error: 'MYSQLND_LLU_SPEC' undeclared
Possibly fix also :
Bug #48780      mysqlnd compile failure
Bug #46952      mysqlnd compile failure with suncc

Bugs: http://bugs.php.net/48198 (Assigned) error: 'MYSQLND_LLU_SPEC'  undeclared
      http://bugs.php.net/48780 (Assigned) mysqlnd compile failure
      http://bugs.php.net/46952 (Assigned) mysqlnd compile failure with suncc
      
Changed paths:
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2009-08-25 12:55:47 UTC 
(rev 287693)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2009-08-25 14:14:23 UTC 
(rev 287694)
@@ -174,11 +174,16 @@
 #define MYSQLND_LLU_SPEC "%lu"
 #endif

-#if __powerpc64__
+#if __powerpc64__ || __ppc64__
 #define MYSQLND_LL_SPEC        "%li"
 #define MYSQLND_LLU_SPEC "%lu"
 #endif

+#if (__powerpc__ || __ppc__ ) && !(__powerpc64__ || __ppc64__)
+#define MYSQLND_LL_SPEC        "%lli"
+#define MYSQLND_LLU_SPEC "%llu"
+#endif
+
 #if __x86_64__
 #define MYSQLND_LL_SPEC        "%li"
 #define MYSQLND_LLU_SPEC "%lu"
@@ -189,11 +194,6 @@
 #define MYSQLND_LLU_SPEC "%lu"
 #endif

-#if __powerpc__ && !__powerpc64__
-#define MYSQLND_LL_SPEC        "%lli"
-#define MYSQLND_LLU_SPEC "%llu"
-#endif
-
 #if __s390__ && !__s390x__
 #define MYSQLND_LL_SPEC        "%lli"
 #define MYSQLND_LLU_SPEC "%llu"
@@ -204,6 +204,19 @@
 #define MYSQLND_LLU_SPEC "%llu"
 #endif

+#ifndef MYSQLND_LL_SPEC
+#if SIZEOF_LONG == 8
+#define MYSQLND_LL_SPEC        "%li"
+#endif
+#endif
+
+#ifndef MYSQLND_LLU_SPEC
+#if SIZEOF_LONG == 8
+#define MYSQLND_LLU_SPEC       "%li"
+#endif
+#endif
+
+
 #define MYSQLND_SZ_T_SPEC "%zd"
 #ifndef L64
 #define L64(x) x##LL

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

Reply via email to