diff options
| author | Zeev Suraski <zeev@php.net> | 2000-02-11 15:59:30 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-02-11 15:59:30 +0000 |
| commit | 80bdd19e031ca0dac2dfd4cb62ff43558d477663 (patch) | |
| tree | 539fd5059d50e32acf9b991354d48cbcecb16426 /ext/standard/exec.c | |
| parent | 80f4886c5a71b0cdc4a3159297160e30ddd298cb (diff) | |
| download | php-git-80bdd19e031ca0dac2dfd4cb62ff43558d477663.tar.gz | |
Fine tune Andi's patch
Diffstat (limited to 'ext/standard/exec.c')
| -rw-r--r-- | ext/standard/exec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 10aff1de45..f12e3dd557 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -86,7 +86,7 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value) tmp = php_escape_shell_cmd(d); efree(d); d = tmp; -#if PHP_WIN32 +#ifdef PHP_WIN32 fp = popen(d, "rb"); #else fp = popen(d, "r"); @@ -98,7 +98,7 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value) return -1; } } else { /* not safe_mode */ -#if PHP_WIN32 +#ifdef PHP_WIN32 fp = popen(cmd, "rb"); #else fp = popen(cmd, "r"); @@ -363,7 +363,7 @@ PHP_FUNCTION(shell_exec) } convert_to_string_ex(cmd); -#if PHP_WIN32 +#ifdef PHP_WIN32 if ((in=popen((*cmd)->value.str.val,"rt"))==NULL) { #else if ((in=popen((*cmd)->value.str.val,"r"))==NULL) { |