diff options
| author | Andrey Hristov <andrey@php.net> | 2009-08-25 14:14:23 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2009-08-25 14:14:23 +0000 |
| commit | eb02cd4450c9b345741f44e19e20a7424e42f71d (patch) | |
| tree | 807cb2ba5bbf1f7146f82899d531802e80daeaff /ext/mysqlnd/mysqlnd_portability.h | |
| parent | 29b238f8782dc0650ffe7f7769acd75df20b7e67 (diff) | |
| download | php-git-eb02cd4450c9b345741f44e19e20a7424e42f71d.tar.gz | |
Fix bug#48198 error: 'MYSQLND_LLU_SPEC' undeclared
Possibly fix also :
Bug #48780 mysqlnd compile failure
Bug #46952 mysqlnd compile failure with suncc
Diffstat (limited to 'ext/mysqlnd/mysqlnd_portability.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_portability.h | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/ext/mysqlnd/mysqlnd_portability.h b/ext/mysqlnd/mysqlnd_portability.h index 9dba7fa515..159500fb6a 100644 --- 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 |