diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /main/spprintf.c | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-4b943c9c0dd4114adc78416c5241f11ad5c98a80.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'main/spprintf.c')
| -rw-r--r-- | main/spprintf.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/main/spprintf.c b/main/spprintf.c index ee73d4f4e5..f860ee3dff 100644 --- a/main/spprintf.c +++ b/main/spprintf.c @@ -410,9 +410,8 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt */ switch (*fmt) { case 'Z': { - TSRMLS_FETCH(); - zvp = (zval*) va_arg(ap, zval*); - free_zcopy = zend_make_printable_zval(zvp, &zcopy TSRMLS_CC); + zvp = (zval*) va_arg(ap, zval*); + free_zcopy = zend_make_printable_zval(zvp, &zcopy); if (free_zcopy) { zvp = &zcopy; } |