diff options
Diffstat (limited to 'ext/gd')
| -rw-r--r-- | ext/gd/gd.c | 20 | ||||
| -rw-r--r-- | ext/gd/gdttf.h | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 91be0bd06e..6d2fb73c99 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -181,19 +181,19 @@ PHP_MINIT_FUNCTION(gd) { #if defined(THREAD_SAFE) gdlib_global_struct *gdlib_globals; - PHP3_MUTEX_ALLOC(gdlib_mutex); - PHP3_MUTEX_LOCK(gdlib_mutex); + PHP_MUTEX_ALLOC(gdlib_mutex); + PHP_MUTEX_LOCK(gdlib_mutex); numthreads++; if (numthreads==1){ if (!PHP3_TLS_PROC_STARTUP(GDlibTls)){ - PHP3_MUTEX_UNLOCK(gdlib_mutex); - PHP3_MUTEX_FREE(gdlib_mutex); + PHP_MUTEX_UNLOCK(gdlib_mutex); + PHP_MUTEX_FREE(gdlib_mutex); return FAILURE; } } - PHP3_MUTEX_UNLOCK(gdlib_mutex); + PHP_MUTEX_UNLOCK(gdlib_mutex); if(!PHP3_TLS_THREAD_INIT(GDlibTls,gdlib_globals,gdlib_global_struct)){ - PHP3_MUTEX_FREE(gdlib_mutex); + PHP_MUTEX_FREE(gdlib_mutex); return FAILURE; } #endif @@ -246,15 +246,15 @@ PHP_MSHUTDOWN_FUNCTION(gd) GD_TLS_VARS; #ifdef THREAD_SAFE PHP3_TLS_THREAD_FREE(gdlib_globals); - PHP3_MUTEX_LOCK(gdlib_mutex); + PHP_MUTEX_LOCK(gdlib_mutex); numthreads--; if (numthreads<1) { PHP3_TLS_PROC_SHUTDOWN(GDlibTls); - PHP3_MUTEX_UNLOCK(gdlib_mutex); - PHP3_MUTEX_FREE(gdlib_mutex); + PHP_MUTEX_UNLOCK(gdlib_mutex); + PHP_MUTEX_FREE(gdlib_mutex); return SUCCESS; } - PHP3_MUTEX_UNLOCK(gdlib_mutex); + PHP_MUTEX_UNLOCK(gdlib_mutex); #endif return SUCCESS; } diff --git a/ext/gd/gdttf.h b/ext/gd/gdttf.h index 8c533e6d91..4f32129702 100644 --- a/ext/gd/gdttf.h +++ b/ext/gd/gdttf.h @@ -2,7 +2,7 @@ #ifdef _OSD_POSIX #ifndef APACHE -#error On this EBCDIC platform, PHP3 is only supported as an Apache module. +#error On this EBCDIC platform, PHP is only supported as an Apache module. #else /*APACHE*/ #ifndef CHARSET_EBCDIC #define CHARSET_EBCDIC /* this machine uses EBCDIC, not ASCII! */ |