pajoye Fri, 17 Sep 2010 10:00:01 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=303456
Log:
- drop tsrmls_fetch in popen_ex
Changed paths:
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
U php/php-src/trunk/TSRM/tsrm_win32.c
U php/php-src/trunk/TSRM/tsrm_win32.h
U php/php-src/trunk/UPGRADING.INTERNALS
Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===================================================================
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2010-09-17 09:27:19 UTC (rev
303455)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2010-09-17 10:00:01 UTC (rev
303456)
@@ -1764,7 +1764,7 @@
#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)
Modified: php/php-src/trunk/TSRM/tsrm_win32.c
===================================================================
--- php/php-src/trunk/TSRM/tsrm_win32.c 2010-09-17 09:27:19 UTC (rev 303455)
+++ php/php-src/trunk/TSRM/tsrm_win32.c 2010-09-17 10:00:01 UTC (rev 303456)
@@ -446,10 +446,12 @@
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 @@
HANDLE token_user = NULL;
BOOL asuser = TRUE;
- TSRMLS_FETCH();
-
if (!type) {
return NULL;
}
Modified: php/php-src/trunk/TSRM/tsrm_win32.h
===================================================================
--- php/php-src/trunk/TSRM/tsrm_win32.h 2010-09-17 09:27:19 UTC (rev 303455)
+++ php/php-src/trunk/TSRM/tsrm_win32.h 2010-09-17 10:00:01 UTC (rev 303456)
@@ -95,7 +95,7 @@
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);
Modified: php/php-src/trunk/UPGRADING.INTERNALS
===================================================================
--- php/php-src/trunk/UPGRADING.INTERNALS 2010-09-17 09:27:19 UTC (rev
303455)
+++ php/php-src/trunk/UPGRADING.INTERNALS 2010-09-17 10:00:01 UTC (rev
303456)
@@ -93,3 +93,6 @@
. 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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
