- drop tsrmls_fetch in popen_ex

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index d6d32e5d70e62e2e11e899476c83d74cd3275e2b..5748dfdca52ce82cbd6a044af457355d3867040f 100644 (file)
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -1764,7 +1764,7 @@ CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC) /* {{{ */
 #ifdef TSRM_WIN32
 CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC) /* {{{ */
 {
-       return popen_ex(command, type, CWDG(cwd).cwd, NULL);
+       return popen_ex(command, type, CWDG(cwd).cwd, NULL TSRMLS_CC);
 }
 /* }}} */
 #elif defined(NETWARE)

diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
index a1fb12f2743aefd7b936abea2af666361ca80c9d..7f07f2920a6cb27b03ec298f7490c4e9ef2a2b7a 100644 (file)
--- a/TSRM/tsrm_win32.c
+++ b/TSRM/tsrm_win32.c
@@ -446,10 +446,12 @@ static HANDLE dupHandle(HANDLE fh, BOOL inherit) {
 
 TSRM_API FILE *popen(const char *command, const char *type)
 {
-       return popen_ex(command, type, NULL, NULL);
+       TSRMLS_FETCH();
+
+       return popen_ex(command, type, NULL, NULL TSRMLS_CC);
 }
 
-TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env)
+TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC)
 {
        FILE *stream = NULL;
        int fno, type_len = strlen(type), read, mode;
@@ -467,8 +469,6 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
        HANDLE token_user = NULL;
        BOOL asuser = TRUE;
 
-       TSRMLS_FETCH();
-
        if (!type) {
                return NULL;
        }

diff --git a/TSRM/tsrm_win32.h b/TSRM/tsrm_win32.h
index 394053d6d7db05953e18a339438a98858b94ceac..5355297f29ce2608b948794f35ca5f23bc961b5e 100644 (file)
--- a/TSRM/tsrm_win32.h
+++ b/TSRM/tsrm_win32.h
@@ -95,7 +95,7 @@ char * tsrm_win32_get_path_sid_key(const char *pathname  TSRMLS_DC);
 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);
+TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC);
 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);

diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index d5fae6b9e30987d4a0aab672e05317dc39d439ca..18aa31c1e404ac74f9ee02966b3d2704bfa774e9 100644 (file)
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -93,3 +93,6 @@ Use emalloc, emalloc_rel, efree or efree_rel instead.
  
 . tsrm_win32_access
   TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC);
+
+. popen_ex (win32)
+  TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC);