kalle Mon, 20 Jul 2009 04:31:07 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=284412
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/proc_open.c
Log:
Fix Windows build
Modified: php/php-src/branches/PHP_5_3/ext/standard/proc_open.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/proc_open.c 2009-07-20
04:30:38 UTC (rev 284411)
+++ php/php-src/branches/PHP_5_3/ext/standard/proc_open.c 2009-07-20
04:31:07 UTC (rev 284412)
@@ -279,9 +279,9 @@
wait_pid = waitpid(proc->child, &wstatus, 0);
} while (wait_pid == -1 && errno == EINTR);
- if (wait_pid == -1)
+ if (wait_pid == -1) {
FG(pclose_ret) = -1;
- else {
+ } else {
if (WIFEXITED(wstatus))
wstatus = WEXITSTATUS(wstatus);
FG(pclose_ret) = wstatus;
@@ -291,7 +291,9 @@
FG(pclose_ret) = -1;
#endif
_php_free_envp(proc->env, proc->is_persistent);
+#if !defined(PHP_WIN32) && !defined(NETWARE)
_php_free_argv(proc->argv, proc->is_persistent);
+#endif
pefree(proc->command, proc->is_persistent);
pefree(proc, proc->is_persistent);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
