diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-03-29 19:06:59 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-03-29 19:06:59 +0100 |
| commit | abd0e015a8d126a8efee4b3625b500053ae9827d (patch) | |
| tree | 8c2c90683002c3f7f30fdeacdb779cf71817d960 /TSRM/TSRM.h | |
| parent | 4006e995772fca4ae2821a0259693901dd229c68 (diff) | |
| parent | 072eb6dd77b079a6f90ca5b155f9b0add1b5f2d4 (diff) | |
| download | php-git-abd0e015a8d126a8efee4b3625b500053ae9827d.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
tsrm environment lock
Diffstat (limited to 'TSRM/TSRM.h')
| -rw-r--r-- | TSRM/TSRM.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index 22ccf61744..d5d9065530 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -84,6 +84,10 @@ extern "C" { TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, char *debug_filename); TSRM_API void tsrm_shutdown(void); +/* environ lock API */ +TSRM_API int tsrm_env_lock(); +TSRM_API int 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); @@ -175,6 +179,9 @@ TSRM_API const char *tsrm_api_name(void); #else /* non ZTS */ +#define tsrm_env_lock() 0 +#define tsrm_env_unlock() 0 + #define TSRMG_STATIC(id, type, element) #define TSRMLS_CACHE_EXTERN() #define TSRMLS_CACHE_DEFINE() |