mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 02:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

MFH:

Browse Source 
Fix bug#48198 error: 'MYSQLND_LLU_SPEC' undeclared
Possibly fix also :
Bug #48780      mysqlnd compile failure
Bug #46952      mysqlnd compile failure with suncc
This commit is contained in:
Andrey Hristov 2009-08-25 14:25:01 +00:00
parent cc8cacd80e
commit 27cbcc6078
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -126,6 +126,8 @@ PHP NEWS
file). (Greg)
- Fixed bug #48247 (Infinite loop and possible crash during startup with
errors when errors are logged). (Jani)
- Fixed bug #48198 error: 'MYSQLND_LLU_SPEC' undeclared. Cause for #48780 and
#46952 - both fixed too. (Andrey)
- Fixed bug #48189 (ibase_execute error in return param). (Kalle)
- Fixed bug #48182 (ssl handshake fails during asynchronous socket connection).
(Sriram Natarajan)

25
ext/mysqlnd/mysqlnd_portability.h
View File

@ -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