diff options
| author | Pierre Joye <pajoye@php.net> | 2010-09-17 09:27:19 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2010-09-17 09:27:19 +0000 |
| commit | 83527d16a323416a354df4ddfbd86fc0efa2967e (patch) | |
| tree | 8c4bd87f498c92675d66c1b489ac0e76c674b426 | |
| parent | 79ee513903fb03a57f2676fb69943b15ff173e91 (diff) | |
| download | php-git-83527d16a323416a354df4ddfbd86fc0efa2967e.tar.gz | |
- drop tsrmls_fetch in tsrm_win32_access
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 2 | ||||
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.h | 2 | ||||
| -rw-r--r-- | TSRM/tsrm_win32.c | 4 | ||||
| -rw-r--r-- | TSRM/tsrm_win32.h | 2 | ||||
| -rw-r--r-- | UPGRADING.INTERNALS | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index b8292520bc..d6d32e5d70 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -1433,7 +1433,7 @@ CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC) /* {{{ */ } #if defined(TSRM_WIN32) - ret = tsrm_win32_access(new_state.cwd, mode); + ret = tsrm_win32_access(new_state.cwd, mode TSRMLS_CC); #else ret = access(new_state.cwd, mode); #endif diff --git a/TSRM/tsrm_virtual_cwd.h b/TSRM/tsrm_virtual_cwd.h index 19953c8956..7f743c88f1 100644 --- a/TSRM/tsrm_virtual_cwd.h +++ b/TSRM/tsrm_virtual_cwd.h @@ -310,7 +310,7 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D); #define VCWD_OPENDIR(pathname) opendir(pathname) #define VCWD_POPEN(command, type) popen(command, type) #if defined(TSRM_WIN32) -#define VCWD_ACCESS(pathname, mode) tsrm_win32_access(pathname, mode) +#define VCWD_ACCESS(pathname, mode) tsrm_win32_access(pathname, mode TSRMLS_CC) #else #define VCWD_ACCESS(pathname, mode) access(pathname, mode) #endif diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index 18917cd16b..a1fb12f274 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -190,7 +190,7 @@ Finished: return NULL; } -TSRM_API int tsrm_win32_access(const char *pathname, int mode) +TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC) { time_t t; HANDLE thread_token; @@ -208,8 +208,6 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode) realpath_cache_bucket * bucket = NULL; char * real_path = NULL; - TSRMLS_FETCH(); - if (mode == 1 /*X_OK*/) { DWORD type; return GetBinaryType(pathname, &type) ? 0 : -1; diff --git a/TSRM/tsrm_win32.h b/TSRM/tsrm_win32.h index dc5f34e5f2..394053d6d7 100644 --- a/TSRM/tsrm_win32.h +++ b/TSRM/tsrm_win32.h @@ -98,7 +98,7 @@ TSRM_API void tsrm_win32_shutdown(void); TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env); TSRM_API FILE *popen(const char *command, const char *type); TSRM_API int pclose(FILE *stream); -TSRM_API int tsrm_win32_access(const char *pathname, int mode); +TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC); TSRM_API int win32_utime(const char *filename, struct utimbuf *buf); TSRM_API int shmget(int key, int size, int flags); diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index a102a2927a..d5fae6b9e3 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -91,3 +91,5 @@ Use emalloc, emalloc_rel, efree or efree_rel instead. . sapi_register_input_filter SAPI_API int sapi_register_input_filter(unsigned int (*input_filter)(int arg, char *var, char **val, unsigned int val_len, unsigned int *new_val_len TSRMLS_DC), unsigned int (*input_filter_init)(TSRMLS_D) TSRMLS_DC); +. tsrm_win32_access + TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC); |