diff options
| author | Felipe Pena <felipe@php.net> | 2008-05-18 22:32:33 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2008-05-18 22:32:33 +0000 |
| commit | a0e34ecfee7bc64c79a86ed4272fab1ae7009a4e (patch) | |
| tree | 94e57131f6f3d3a12267bfd83bd33bf8aa744f01 /ext/standard | |
| parent | 0f3bde23fd7a7d6c3e241de8340e25ac4f750257 (diff) | |
| download | php-git-a0e34ecfee7bc64c79a86ed4272fab1ae7009a4e.tar.gz | |
- Reverted the accidental previous commit
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/basic_functions.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 1ea91afdc7..cec0b1f636 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3859,17 +3859,9 @@ static void php_putenv_destructor(putenv_entry *pe) SetEnvironmentVariable(pe->key, "bugbug"); #endif putenv(pe->previous_value); -<<<<<<< basic_functions.c -#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7)) -======= # if defined(PHP_WIN32) ->>>>>>> 1.725.2.31.2.71 efree(pe->previous_value); -<<<<<<< basic_functions.c -#endif -======= # endif ->>>>>>> 1.725.2.31.2.71 } else { # if HAVE_UNSETENV unsetenv(pe->key); @@ -4469,13 +4461,8 @@ PHP_FUNCTION(putenv) pe.previous_value = NULL; for (env = environ; env != NULL && *env != NULL; env++) { if (!strncmp(*env, pe.key, pe.key_len) && (*env)[pe.key_len] == '=') { /* found it */ -<<<<<<< basic_functions.c -#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7)) - /* must copy previous value because putenv can free the string without notice */ -======= #if defined(PHP_WIN32) /* must copy previous value because MSVCRT's putenv can free the string without notice */ ->>>>>>> 1.725.2.31.2.71 pe.previous_value = estrdup(*env); #else pe.previous_value = *env; |