Skip to content

Commit c2bdb31

Browse files
committed
ext/mysqli: Remove PHP 6 remnants
1 parent 0c827f6 commit c2bdb31

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

ext/mysqli/mysqli_warning.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@
2424
#include "php_mysqli_structs.h"
2525
#include "mysqli_priv.h"
2626

27-
/* Define these in the PHP7 tree to make merging easy process */
28-
#define ZSTR_DUPLICATE (1<<0)
29-
#define ZSTR_AUTOFREE (1<<1)
30-
31-
#define ZVAL_UTF8_STRING(z, s, flags) ZVAL_STRING((z), (char*)(s))
32-
#define ZVAL_UTF8_STRINGL(z, s, l, flags) ZVAL_STRINGL((z), (char*)(s), (l))
33-
3427
/* {{{ void php_clear_warnings() */
3528
void php_clear_warnings(MYSQLI_WARNING *w)
3629
{
@@ -57,7 +50,7 @@ MYSQLI_WARNING *php_new_warning(zval * reason, int errorno)
5750
ZVAL_COPY(&w->reason, reason);
5851
convert_to_string(&w->reason);
5952

60-
ZVAL_UTF8_STRINGL(&(w->sqlstate), "HY000", sizeof("HY000") - 1, ZSTR_DUPLICATE);
53+
ZVAL_STRINGL(&(w->sqlstate), "HY000", sizeof("HY000") - 1);
6154

6255
w->errorno = errorno;
6356

0 commit comments

Comments
 (0)