diff options
Diffstat (limited to 'TSRM/tsrm_win32.c')
| -rw-r--r-- | TSRM/tsrm_win32.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index 9765874448..bc2ea51724 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -40,8 +40,11 @@ static ts_rsrc_id win32_globals_id; static tsrm_win32_globals win32_globals; #endif -static void tsrm_win32_ctor(tsrm_win32_globals *globals TSRMLS_DC) +static void tsrm_win32_ctor(tsrm_win32_globals *globals) { +#ifdef ZTS +TSRMLS_CACHE_UPDATE; +#endif globals->process = NULL; globals->shm = NULL; globals->process_size = 0; @@ -59,7 +62,7 @@ static void tsrm_win32_ctor(tsrm_win32_globals *globals TSRMLS_DC) globals->impersonation_token_sid = NULL; } -static void tsrm_win32_dtor(tsrm_win32_globals *globals TSRMLS_DC) +static void tsrm_win32_dtor(tsrm_win32_globals *globals) { shm_pair *ptr; @@ -92,18 +95,18 @@ TSRM_API void tsrm_win32_startup(void) #ifdef ZTS ts_allocate_id(&win32_globals_id, sizeof(tsrm_win32_globals), (ts_allocate_ctor)tsrm_win32_ctor, (ts_allocate_ctor)tsrm_win32_dtor); #else - tsrm_win32_ctor(&win32_globals TSRMLS_CC); + tsrm_win32_ctor(&win32_globals); #endif } TSRM_API void tsrm_win32_shutdown(void) { #ifndef ZTS - tsrm_win32_dtor(&win32_globals TSRMLS_CC); + tsrm_win32_dtor(&win32_globals); #endif } -char * tsrm_win32_get_path_sid_key(const char *pathname TSRMLS_DC) +char * tsrm_win32_get_path_sid_key(const char *pathname) { PSID pSid = TWG(impersonation_token_sid); TCHAR *ptcSid = NULL; @@ -191,7 +194,7 @@ Finished: return NULL; } -TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC) +TSRM_API int tsrm_win32_access(const char *pathname, int mode) { time_t t; HANDLE thread_token = NULL; @@ -214,7 +217,7 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC) } else { if(!IS_ABSOLUTE_PATH(pathname, strlen(pathname)+1)) { real_path = (char *)malloc(MAX_PATH); - if(tsrm_realpath(pathname, real_path TSRMLS_CC) == NULL) { + if(tsrm_realpath(pathname, real_path) == NULL) { goto Finished; } pathname = real_path; @@ -278,14 +281,14 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC) if (CWDG(realpath_cache_size_limit)) { t = time(0); - bucket = realpath_cache_lookup(pathname, (int)strlen(pathname), t TSRMLS_CC); + bucket = realpath_cache_lookup(pathname, (int)strlen(pathname), t); if(bucket == NULL && real_path == NULL) { /* We used the pathname directly. Call tsrm_realpath */ /* so that entry is created in realpath cache */ real_path = (char *)malloc(MAX_PATH); - if(tsrm_realpath(pathname, real_path TSRMLS_CC) != NULL) { + if(tsrm_realpath(pathname, real_path) != NULL) { pathname = real_path; - bucket = realpath_cache_lookup(pathname, (int)strlen(pathname), t TSRMLS_CC); + bucket = realpath_cache_lookup(pathname, (int)strlen(pathname), t); } } } @@ -380,7 +383,7 @@ Finished: } -static process_pair *process_get(FILE *stream TSRMLS_DC) +static process_pair *process_get(FILE *stream) { process_pair *ptr; process_pair *newptr; @@ -410,7 +413,6 @@ static shm_pair *shm_get(int key, void *addr) { shm_pair *ptr; shm_pair *newptr; - TSRMLS_FETCH(); for (ptr = TWG(shm); ptr < (TWG(shm) + TWG(shm_size)); ptr++) { if (!ptr->descriptor) { @@ -448,12 +450,11 @@ static HANDLE dupHandle(HANDLE fh, BOOL inherit) { TSRM_API FILE *popen(const char *command, const char *type) { - TSRMLS_FETCH(); - return popen_ex(command, type, NULL, NULL TSRMLS_CC); + return popen_ex(command, type, NULL, NULL); } -TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC) +TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env) { FILE *stream = NULL; int fno, type_len, read, mode; @@ -550,7 +551,7 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, } CloseHandle(process.hThread); - proc = process_get(NULL TSRMLS_CC); + proc = process_get(NULL); if (read) { fno = _open_osfhandle((tsrm_intptr_t)in, _O_RDONLY | mode); @@ -570,9 +571,8 @@ TSRM_API int pclose(FILE *stream) { DWORD termstat = 0; process_pair *process; - TSRMLS_FETCH(); - if ((process = process_get(stream TSRMLS_CC)) == NULL) { + if ((process = process_get(stream)) == NULL) { return 0; } |