diff options
| author | Anatol Belski <ab@php.net> | 2014-09-20 19:46:44 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-20 19:46:44 +0200 |
| commit | 132cd8be0d13eaeee200cfa09b0596f6619c6a7e (patch) | |
| tree | 7a928718769260e60252c0e048d2f10d0cd94f8c /ext/mysqli/mysqli_warning.c | |
| parent | 763bfb4f3b0e66d5a961f9f367aa86e9f9da262e (diff) | |
| parent | 268bcdc1cb668f76b85a84bc4d32194548cc185a (diff) | |
| download | php-git-132cd8be0d13eaeee200cfa09b0596f6619c6a7e.tar.gz | |
Merge branch 'pull-request/805'
* pull-request/805:
Removes accidentally added files.
Reverts some unwanted changes
Deletes patch leftovers
Replaces php5 with php7, without whitespace changes.
Diffstat (limited to 'ext/mysqli/mysqli_warning.c')
| -rw-r--r-- | ext/mysqli/mysqli_warning.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c index cd8050c99f..084bc58581 100644 --- a/ext/mysqli/mysqli_warning.c +++ b/ext/mysqli/mysqli_warning.c @@ -28,7 +28,7 @@ #include "php_mysqli_structs.h" #include "mysqli_priv.h" -/* Define these in the PHP5 tree to make merging easy process */ +/* Define these in the PHP7 tree to make merging easy process */ #define Zzend_string_dupLICATE (1<<0) #define ZSTR_AUTOFREE (1<<1) |