diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-11 10:42:05 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-11 10:42:05 +0200 |
| commit | f89f67037ab3dab761e708898f43fa46f1d23774 (patch) | |
| tree | 0dcec8e7ea0352b2192fce8547c7a4cf38202416 /TSRM | |
| parent | 77c522062af20a19d02ec9c612721329fce38588 (diff) | |
| parent | b213f13a2621ec553beec06d3e2f163c1e7e2282 (diff) | |
| download | php-git-f89f67037ab3dab761e708898f43fa46f1d23774.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/TSRM.c | 8 | ||||
| -rw-r--r-- | TSRM/TSRM.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c index 2d17ffcabc..2632543621 100644 --- a/TSRM/TSRM.c +++ b/TSRM/TSRM.c @@ -219,12 +219,12 @@ TSRM_API void tsrm_shutdown(void) /* {{{ */ /* environ lock api */ -TSRM_API int tsrm_env_lock() { - return tsrm_mutex_lock(tsrm_env_mutex); +TSRM_API void tsrm_env_lock() { + tsrm_mutex_lock(tsrm_env_mutex); } -TSRM_API int tsrm_env_unlock() { - return tsrm_mutex_unlock(tsrm_env_mutex); +TSRM_API void tsrm_env_unlock() { + tsrm_mutex_unlock(tsrm_env_mutex); } /* }}} */ /* enlarge the arrays for the already active threads */ diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index 54b3ce1214..db4b970bf6 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -83,8 +83,8 @@ TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debu TSRM_API void tsrm_shutdown(void); /* environ lock API */ -TSRM_API int tsrm_env_lock(); -TSRM_API int tsrm_env_unlock(); +TSRM_API void tsrm_env_lock(); +TSRM_API void tsrm_env_unlock(); /* allocates a new thread-safe-resource id */ TSRM_API ts_rsrc_id ts_allocate_id(ts_rsrc_id *rsrc_id, size_t size, ts_allocate_ctor ctor, ts_allocate_dtor dtor); @@ -178,8 +178,8 @@ TSRM_API const char *tsrm_api_name(void); #else /* non ZTS */ -#define tsrm_env_lock() 0 -#define tsrm_env_unlock() 0 +#define tsrm_env_lock() +#define tsrm_env_unlock() #define TSRMG_STATIC(id, type, element) #define TSRMLS_CACHE_EXTERN() |