Re: svn: /php/php-src/branches/PHP_5_3/ NEWS ext/mysqlnd/mysqlnd_portability.h

Jani Taskinen wrote:

This should propably be some FAQ somewhere, but please commit things in one single commit. (sparse checkouts rule! :)

One single commit ? I did commit at once. One cause for three bugs, maybe they should be classified as duplicates. Andrey

--Jani On 08/25/2009 05:25 PM, Andrey Hristov wrote:

andrey                                   Tue, 25 Aug 2009 14:25:01 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=287695 Log: MFH: Fix bug#48198 error: 'MYSQLND_LLU_SPEC' undeclared Possibly fix also :

Bug #48780      mysqlnd compile failure
Bug #46952      mysqlnd compile failure with suncc

Bugs: http://bugs.php.net/48198 (Assigned) error: 'MYSQLND_LLU_SPEC' undeclared

       http://bugs.php.net/48780 (Assigned) mysqlnd compile failure
       http://bugs.php.net/46952 (Assigned) mysqlnd compile failure with suncc

Changed paths:

     U   php/php-src/branches/PHP_5_3/NEWS
     U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h

Modified: php/php-src/branches/PHP_5_3/NEWS ===================================================================

--- php/php-src/branches/PHP_5_3/NEWS    2009-08-25 14:14:23 UTC (rev 287694)
+++ php/php-src/branches/PHP_5_3/NEWS    2009-08-25 14:25:01 UTC (rev 287695)

@@ -126,6 +126,8 @@

    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)

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h ===================================================================

--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h    2009-08-25 14:14:23 UTC (rev 287694)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h    2009-08-25 14:25:01 UTC (rev 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" @@ -204,6 +204,19 @@ #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