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 /ext/gd/libgd | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/gd/libgd')
| -rw-r--r-- | ext/gd/libgd/gd.c | 6 | ||||
| -rw-r--r-- | ext/gd/libgd/gdft.c | 3 | ||||
| -rw-r--r-- | ext/gd/libgd/gdkanji.c | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c index 54890bc177..59fcd3533a 100644 --- a/ext/gd/libgd/gd.c +++ b/ext/gd/libgd/gd.c @@ -102,10 +102,9 @@ void php_gd_error_ex(int type, const char *format, ...) { va_list args; - TSRMLS_FETCH(); va_start(args, format); - php_verror(NULL, "", type, format, args TSRMLS_CC); + php_verror(NULL, "", type, format, args); va_end(args); } @@ -113,10 +112,9 @@ void php_gd_error(const char *format, ...) { va_list args; - TSRMLS_FETCH(); va_start(args, format); - php_verror(NULL, "", E_WARNING, format, args TSRMLS_CC); + php_verror(NULL, "", E_WARNING, format, args); va_end(args); } diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c index 763efcf68c..c967de6ffb 100644 --- a/ext/gd/libgd/gdft.c +++ b/ext/gd/libgd/gdft.c @@ -412,8 +412,7 @@ static void *fontFetch (char **error, void *key) for (dir = gd_strtok_r (path, PATHSEPARATOR, &strtok_ptr_path); dir; dir = gd_strtok_r (0, PATHSEPARATOR, &strtok_ptr_path)) { if (!strcmp(dir, ".")) { - TSRMLS_FETCH(); -#if HAVE_GETCWD + #if HAVE_GETCWD dir = VCWD_GETCWD(cur_dir, MAXPATHLEN); #elif HAVE_GETWD dir = VCWD_GETWD(cur_dir); diff --git a/ext/gd/libgd/gdkanji.c b/ext/gd/libgd/gdkanji.c index 37f3bd10a0..2f6110c532 100644 --- a/ext/gd/libgd/gdkanji.c +++ b/ext/gd/libgd/gdkanji.c @@ -74,12 +74,11 @@ error (const char *format,...) { va_list args; char *tmp; - TSRMLS_FETCH(); va_start(args, format); vspprintf(&tmp, 0, format, args); va_end(args); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s: %s", LIBNAME, tmp); + php_error_docref(NULL, E_WARNING, "%s: %s", LIBNAME, tmp); efree(tmp); } |