diff options
Diffstat (limited to 'ext/mysqli/mysqli_priv.h')
| -rw-r--r-- | ext/mysqli/mysqli_priv.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ext/mysqli/mysqli_priv.h b/ext/mysqli/mysqli_priv.h index b1bfb56a8d..f49236358e 100644 --- a/ext/mysqli/mysqli_priv.h +++ b/ext/mysqli/mysqli_priv.h @@ -84,8 +84,7 @@ extern PHPAPI zend_class_entry *spl_ce_RuntimeException; #define PHP_MYSQLI_EXPORT(__type) PHP_MYSQLI_API __type -PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry * TSRMLS_DC); - +PHP_MYSQLI_EXPORT(zend_object *) mysqli_objects_new(zend_class_entry * TSRMLS_DC); #define MYSQLI_DISABLE_MQ if (mysql->multi_query) { \ mysql_set_server_option(mysql->mysql, MYSQL_OPTION_MULTI_STATEMENTS_OFF); \ @@ -97,17 +96,14 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry * TSRML mysql->multi_query = 1; \ } - #define MYSQLI_RETURN_LONG_LONG(__val) \ { \ if ((__val) < LONG_MAX) { \ RETURN_LONG((long) (__val)); \ } else { \ - char *ret; \ /* always used with my_ulonglong -> %llu */ \ - int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, (__val)); \ - RETURN_STRINGL(ret, l, 0); \ - } \ + RETURN_STR(strpprintf(0, MYSQLI_LLU_SPEC, (__val))); \ + } \ } #define MYSQLI_STORE_RESULT 0 |