diff options
| author | Nikita Popov <nikic@php.net> | 2016-03-03 23:13:50 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-03-03 23:20:12 +0100 |
| commit | 5602f6421372848a6fbb23fbe6bbca47d94dd49a (patch) | |
| tree | 6ac033d376ecbb817b71895dfa92b96fc351c73e /ext/mysqlnd | |
| parent | 3240dd93b3f8a92ae587df20d7e07d436d0be2a9 (diff) | |
| download | php-git-5602f6421372848a6fbb23fbe6bbca47d94dd49a.tar.gz | |
Eliminate usages of _PP macros
These are either in debug code (fix them), commented out (drop
them) or in dead compatibility macros (drop them).
One usage was in php_stream_get_from_zval(), which we have not used
since at least PHP 5.2 and, judging from the fact that nobody
complained about it causing compile errors in PHP 7, nobody else
uses it either, so drop it.
There are still remaining uses in mysqli embedded and odbc birdstep.
These probably need to be dropped outright.
Diffstat (limited to 'ext/mysqlnd')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_priv.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/ext/mysqlnd/mysqlnd_priv.h b/ext/mysqlnd/mysqlnd_priv.h index 86baf121fe..0d8908b13c 100644 --- a/ext/mysqlnd/mysqlnd_priv.h +++ b/ext/mysqlnd/mysqlnd_priv.h @@ -23,24 +23,10 @@ #ifndef MYSQLND_PRIV_H #define MYSQLND_PRIV_H -#ifndef Z_ADDREF_P -/* PHP 5.2, old GC */ -#define Z_ADDREF_P(pz) (++(pz)->refcount) -#define Z_DELREF_P(pz) (--(pz)->refcount) -#define Z_REFCOUNT_P(pz) ((pz)->refcount) -#define Z_SET_REFCOUNT_P(pz, rc) ((pz)->refcount = rc) -#define Z_REFCOUNT_PP(ppz) Z_REFCOUNT_P(*(ppz)) -#define Z_DELREF_PP(ppz) Z_DELREF_P(*(ppz)) -#endif - #ifdef ZTS #include "TSRM.h" #endif -#ifndef pestrndup -#define pestrndup(s, length, persistent) ((persistent)?zend_strndup((s),(length)):estrndup((s),(length))) -#endif - #define MYSQLND_STR_W_LEN(str) str, (sizeof(str) - 1) #define MYSQLND_DEBUG_DUMP_TIME 1 |