Ticket #20833: php5.diff

files/patch-ext-mysqlnd-mysqlnd_portability.h.diff

@@ +1 @@
+http://trac.macports.org/ticket/20833
+--- ext/mysqlnd/mysqlnd_portability.h   2009/08/25 14:14:23     287694
++++ ext/mysqlnd/mysqlnd_portability.h   2009/08/25 14:25:01     287695
+@@ -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"
+@@ -203,6 +203,19 @@
+ #define MYSQLND_LL_SPEC "%lli"
+ #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

Portfile

@@ -46 +46 @@
     port:zlib
 
 patchfiles \
+    patch-ext-mysqlnd-mysqlnd_portability.h.diff \
     patch-bind.diff
 
 use_autoconf            yes