com php-src: fix windows build: ext/standard/basic_functions .c
| From: | Ferenc Kovacs | Date: | Thu, 14 May 2015 00:02:08 +0000 |
| Subject: | com php-src: fix windows build: ext/standard/basic_functions .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86755@lists.php.net to get a copy of this message | ||
Commit: 3cb1be7a1b71f4a9f2852d471af0bbfef5308278
Author: Ferenc Kovacs <tyrael@php.net> Thu, 14 May 2015 02:02:08 +0200
Parents: d8bf5110d5191f31a9c475d359e9c2ac79e84e96
Branches: PHP-5.5.25
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3cb1be7a1b71f4a9f2852d471af0bbfef5308278
Log:
fix windows build
Changed paths:
M ext/standard/basic_functions.c
Diff:
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 83d140e..98a5bb6 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -4151,13 +4151,6 @@ PHP_FUNCTION(putenv)
&& _putenv(pe.putenv_string) == 0
# endif
) { /* success */
-# if _MSC_VER < 1500
- /* Yet another VC6 bug, unset may return env not found */
- if (error_code != 0 ||
- (error_code == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND)) {
-# else
- if (error_code != 0) { /* success */
-# endif
# endif
#endif
zend_hash_add(&BG(putenv_ht), pe.key, pe.key_len + 1, (void **) &pe,
sizeof(putenv_entry), NULL);