diff options
| author | Zeev Suraski <zeev@php.net> | 2000-02-26 03:20:55 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-02-26 03:20:55 +0000 |
| commit | bf5cb890b05504fc4299ec154c00c483130f0602 (patch) | |
| tree | 36b6cdabb434abee61c16535c625cc46496daab2 /ext/db/db.c | |
| parent | 1841e77906f656609a98fb1ccf4d5ace5d7de6f6 (diff) | |
| download | php-git-bf5cb890b05504fc4299ec154c00c483130f0602.tar.gz | |
- Convert 'PHP3' to 'PHP'
- Avoid declaring crypt() related salt types twice
Diffstat (limited to 'ext/db/db.c')
| -rw-r--r-- | ext/db/db.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/db/db.c b/ext/db/db.c index 34d1dc7faf..0373c3b27b 100644 --- a/ext/db/db.c +++ b/ext/db/db.c @@ -1071,19 +1071,19 @@ PHP_MINIT_FUNCTION(db) { #if defined(THREAD_SAFE) dbm_global_struct *dbm_globals; - PHP3_MUTEX_ALLOC(dbm_mutex); - PHP3_MUTEX_LOCK(dbm_mutex); + PHP_MUTEX_ALLOC(dbm_mutex); + PHP_MUTEX_LOCK(dbm_mutex); numthreads++; if (numthreads==1){ if (!PHP3_TLS_PROC_STARTUP(DbmTls)){ - PHP3_MUTEX_UNLOCK(dbm_mutex); - PHP3_MUTEX_FREE(dbm_mutex); + PHP_MUTEX_UNLOCK(dbm_mutex); + PHP_MUTEX_FREE(dbm_mutex); return FAILURE; } } - PHP3_MUTEX_UNLOCK(dbm_mutex); + PHP_MUTEX_UNLOCK(dbm_mutex); if(!PHP3_TLS_THREAD_INIT(DbmTls,dbm_globals,dbm_global_struct)){ - PHP3_MUTEX_FREE(dbm_mutex); + PHP_MUTEX_FREE(dbm_mutex); return FAILURE; } #endif @@ -1096,15 +1096,15 @@ static PHP_MSHUTDOWN_FUNCTION(db) { #ifdef THREAD_SAFE PHP3_TLS_THREAD_FREE(dbm_globals); - PHP3_MUTEX_LOCK(dbm_mutex); + PHP_MUTEX_LOCK(dbm_mutex); numthreads--; if (numthreads<1) { PHP3_TLS_PROC_SHUTDOWN(DbmTls); - PHP3_MUTEX_UNLOCK(dbm_mutex); - PHP3_MUTEX_FREE(dbm_mutex); + PHP_MUTEX_UNLOCK(dbm_mutex); + PHP_MUTEX_FREE(dbm_mutex); return SUCCESS; } - PHP3_MUTEX_UNLOCK(dbm_mutex); + PHP_MUTEX_UNLOCK(dbm_mutex); #endif return SUCCESS; } |