summaryrefslogtreecommitdiff
path: root/ext/mysqli/php_mysqli.h
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2007-09-12 09:12:56 +0000
committerAndrey Hristov <andrey@php.net>2007-09-12 09:12:56 +0000
commitdc34874dc95668dda522ed249cda4a7927cae839 (patch)
treecac07b1abc6c619bd0e67cb7a989547118a856de /ext/mysqli/php_mysqli.h
parent5e6724b1220736eaa22cc6d045baa1f7dad2d8cc (diff)
downloadphp-git-dc34874dc95668dda522ed249cda4a7927cae839.tar.gz
Fix stupid error, which happens only on Windows. And we thought this has
been fixed. Now my_thread_end() should be called and there should be no warnings in the error logs of exiting thread, which hasn't deinited, and leaks.
Diffstat (limited to 'ext/mysqli/php_mysqli.h')
-rw-r--r--ext/mysqli/php_mysqli.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
index 812d6b89d2..bc4ce56bee 100644
--- a/ext/mysqli/php_mysqli.h
+++ b/ext/mysqli/php_mysqli.h
@@ -241,9 +241,10 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry * TSRML
#define MYSQLI_RETURN_LONG_LONG(__val) \
{ \
if ((__val) < LONG_MAX) { \
- RETURN_LONG((__val)); \
+ RETURN_LONG((long) (__val)); \
} else { \
char *ret; \
+ /* always used with my_ulonglong -> %llu */ \
int l = spprintf(&ret, 0, "%llu", (__val)); \
RETURN_STRINGL(ret, l, 0); \
} \