cvs: php-src(PHP_5_3) /ext/mysqli php_mysqli_structs.h
| From: | Andrey Hristov | Date: | Wed, 27 May 2009 19:57:11 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/mysqli php_mysqli_structs.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-58302@lists.php.net to get a copy of this message | ||
andrey Wed May 27 19:57:11 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli php_mysqli_structs.h
Log:
MFH:because we use int64_t we need corresponding printf modifiers. the type
can be different on 32 and 64 bit, thus we can't use ld and lld but
C helps us with inttypes.h and PRId64 and PRIu64 modifiers (without the %)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/php_mysqli_structs.h?r1=1.4.2.18&r2=1.4.2.19&diff_format=u
Index: php-src/ext/mysqli/php_mysqli_structs.h
diff -u php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.18
php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.19
--- php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.18 Thu Jan 22 21:01:56 2009
+++ php-src/ext/mysqli/php_mysqli_structs.h Wed May 27 19:57:11 2009
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: php_mysqli_structs.h,v 1.4.2.18 2009/01/22 21:01:56 johannes Exp $
+ $Id: php_mysqli_structs.h,v 1.4.2.19 2009/05/27 19:57:11 andrey Exp $
*/
#ifndef PHP_MYSQLI_STRUCTS_H
@@ -141,7 +141,7 @@
#if !defined(MYSQLI_USE_MYSQLND)
typedef struct {
char error_msg[LOCAL_INFILE_ERROR_LEN];
- void *userdata;
+ void *userdata;
} mysqli_local_infile;
#endif
@@ -161,10 +161,12 @@
# else
# define PHP_MYSQLI_API
# endif
-#define MYSQLI_LLU_SPEC "%llu"
-#define MYSQLI_LL_SPEC "%lld"
+/* we need this for PRIu64 and PRId64 */
+#include <inttypes.h>
+#define MYSQLI_LLU_SPEC "%" PRIu64
+#define MYSQLI_LL_SPEC "%" PRId64
#define L64(x) x##LL
-typedef long long my_longlong;
+typedef int64_t my_longlong;
#endif
#ifdef ZTS