| 1 | http://trac.macports.org/ticket/20833 |
| 2 | --- ext/mysqlnd/mysqlnd_portability.h 2009/08/25 14:14:23 287694 |
| 3 | +++ ext/mysqlnd/mysqlnd_portability.h 2009/08/25 14:25:01 287695 |
| 4 | @@ -174,11 +174,16 @@ |
| 5 | #define MYSQLND_LLU_SPEC "%lu" |
| 6 | #endif |
| 7 | |
| 8 | -#if __powerpc64__ |
| 9 | +#if __powerpc64__ || __ppc64__ |
| 10 | #define MYSQLND_LL_SPEC "%li" |
| 11 | #define MYSQLND_LLU_SPEC "%lu" |
| 12 | #endif |
| 13 | |
| 14 | +#if (__powerpc__ || __ppc__ ) && !(__powerpc64__ || __ppc64__) |
| 15 | +#define MYSQLND_LL_SPEC "%lli" |
| 16 | +#define MYSQLND_LLU_SPEC "%llu" |
| 17 | +#endif |
| 18 | + |
| 19 | #if __x86_64__ |
| 20 | #define MYSQLND_LL_SPEC "%li" |
| 21 | #define MYSQLND_LLU_SPEC "%lu" |
| 22 | @@ -189,11 +194,6 @@ |
| 23 | #define MYSQLND_LLU_SPEC "%lu" |
| 24 | #endif |
| 25 | |
| 26 | -#if __powerpc__ && !__powerpc64__ |
| 27 | -#define MYSQLND_LL_SPEC "%lli" |
| 28 | -#define MYSQLND_LLU_SPEC "%llu" |
| 29 | -#endif |
| 30 | - |
| 31 | #if __s390__ && !__s390x__ |
| 32 | #define MYSQLND_LL_SPEC "%lli" |
| 33 | #define MYSQLND_LLU_SPEC "%llu" |
| 34 | @@ -203,6 +203,19 @@ |
| 35 | #define MYSQLND_LL_SPEC "%lli" |
| 36 | #define MYSQLND_LLU_SPEC "%llu" |
| 37 | #endif |
| 38 | + |
| 39 | +#ifndef MYSQLND_LL_SPEC |
| 40 | +#if SIZEOF_LONG == 8 |
| 41 | +#define MYSQLND_LL_SPEC "%li" |
| 42 | +#endif |
| 43 | +#endif |
| 44 | + |
| 45 | +#ifndef MYSQLND_LLU_SPEC |
| 46 | +#if SIZEOF_LONG == 8 |
| 47 | +#define MYSQLND_LLU_SPEC "%li" |
| 48 | +#endif |
| 49 | +#endif |
| 50 | + |
| 51 | |
| 52 | #define MYSQLND_SZ_T_SPEC "%zd" |
| 53 | #ifndef L64 |