Fix bug#48198 error: 'MYSQLND_LLU_SPEC' undeclared

Possibly fix also :
Bug #48780  	mysqlnd compile failure
Bug #46952  	mysqlnd compile failure with suncc

diff --git a/ext/mysqlnd/mysqlnd_portability.h b/ext/mysqlnd/mysqlnd_portability.h
index 9dba7fa515249dfd69c86a09e4b1be75030b9176..159500fb6a831ab81b64acfb655843e31bd7cdb2 100644 (file)
--- a/ext/mysqlnd/mysqlnd_portability.h
+++ b/ext/mysqlnd/mysqlnd_portability.h
@@ -174,11 +174,16 @@ typedef unsigned long long uint64_t;
 #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 @@ typedef unsigned long long uint64_t;
 #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 @@ typedef unsigned long long uint64_t;
 #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