com php-src: Fixed broken name: ext/mysqli/mysqli_warning.c

Commit: 068f63ceb263a5595227b9f1de77a6be6d456c71 Author: Dmitry Stogov <dmitry@zend.com> Wed, 1 Jul 2015 18:23:06 +0300 Parents: 2ea3258ed5ed89dbb53df55a848f8a0aa9f10a14 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=068f63ceb263a5595227b9f1de77a6be6d456c71 Log: Fixed broken name Changed paths: M ext/mysqli/mysqli_warning.c Diff: diff --git a/ext/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c index 7d69ce6..fa42e87 100644 --- a/ext/mysqli/mysqli_warning.c +++ b/ext/mysqli/mysqli_warning.c @@ -29,7 +29,7 @@ #include "mysqli_priv.h" /* Define these in the PHP7 tree to make merging easy process */ -#define Zzend_string_dupLICATE (1<<0) +#define ZSTR_DUPLICATE (1<<0) #define ZSTR_AUTOFREE (1<<1) #define ZVAL_UTF8_STRING(z, s, flags) ZVAL_STRING((z), (char*)(s)) @@ -59,9 +59,9 @@ MYSQLI_WARNING *php_new_warning(const char *reason, int errorno) w = (MYSQLI_WARNING *)ecalloc(1, sizeof(MYSQLI_WARNING)); - ZVAL_UTF8_STRING(&(w->reason), reason, Zzend_string_dupLICATE); + ZVAL_UTF8_STRING(&(w->reason), reason, ZSTR_DUPLICATE); - ZVAL_UTF8_STRINGL(&(w->sqlstate), "HY000", sizeof("HY000") - 1, Zzend_string_dupLICATE); + ZVAL_UTF8_STRINGL(&(w->sqlstate), "HY000", sizeof("HY000") - 1, ZSTR_DUPLICATE); w->errorno = errorno; @@ -108,7 +108,7 @@ MYSQLI_WARNING *php_new_warning(zval * reason, int errorno) ZVAL_COPY(&w->reason, reason); convert_to_string(&w->reason); - ZVAL_UTF8_STRINGL(&(w->sqlstate), "HY000", sizeof("HY000") - 1, Zzend_string_dupLICATE); + ZVAL_UTF8_STRINGL(&(w->sqlstate), "HY000", sizeof("HY000") - 1, ZSTR_DUPLICATE); w->errorno = errorno;