summaryrefslogtreecommitdiff
path: root/TSRM/tsrm_win32.h
diff options
context:
space:
mode:
Diffstat (limited to 'TSRM/tsrm_win32.h')
-rw-r--r--TSRM/tsrm_win32.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/TSRM/tsrm_win32.h b/TSRM/tsrm_win32.h
index beff1e88cf..8cefb664be 100644
--- a/TSRM/tsrm_win32.h
+++ b/TSRM/tsrm_win32.h
@@ -71,7 +71,8 @@ typedef struct {
} tsrm_win32_globals;
#ifdef ZTS
-# define TWG(v) TSRMG(win32_globals_id, tsrm_win32_globals *, v)
+# define TWG(v) TSRMG_STATIC(win32_globals_id, tsrm_win32_globals *, v)
+TSRMLS_CACHE_EXTERN;
#else
# define TWG(v) (win32_globals.v)
#endif
@@ -93,15 +94,15 @@ typedef struct {
#define SHM_RND FILE_MAP_WRITE
#define SHM_REMAP FILE_MAP_COPY
-char * tsrm_win32_get_path_sid_key(const char *pathname TSRMLS_DC);
+char * tsrm_win32_get_path_sid_key(const char *pathname );
TSRM_API void tsrm_win32_startup(void);
TSRM_API void tsrm_win32_shutdown(void);
-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);
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 TSRMLS_DC);
+TSRM_API int tsrm_win32_access(const char *pathname, int mode);
TSRM_API int win32_utime(const char *filename, struct utimbuf *buf);
TSRM_API int shmget(int key, int size, int flags);