MF4: allow realpath() for win32 non-ZTS

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 617aadab0a0c885cc1c4f3133e276b0beba58f20..34e99c0d91b377cdb78ede30ca76e873525741ac 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -740,7 +740,7 @@ function_entry basic_functions[] = {
 
        PHP_FALIAS(socket_get_status, stream_get_meta_data,                                             NULL)
 
-#if (!defined(PHP_WIN32) && !defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
+#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
        PHP_FE(realpath,                                                                                                                NULL)
 #endif
 

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 69b1c00df82e7775bbef4866bd78d4dc93095743..79390cd7a32023812a718fae354e4ca5c2c26900 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1925,7 +1925,7 @@ normal_char:
 }
 /* }}} */
 
-#if (!defined(PHP_WIN32) && !defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
+#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
 /* {{{ proto string realpath(string path)
    Return the resolved path */
 PHP_FUNCTION(realpath)

diff --git a/ext/standard/file.h b/ext/standard/file.h
index 3e06413cbff4d03970a4edbb216810e4dd6d6337..f8eb8a01581456c8f15572067f95df8ef61156b9 100644 (file)
--- a/ext/standard/file.h
+++ b/ext/standard/file.h
@@ -59,7 +59,7 @@ PHP_FUNCTION(get_meta_tags);
 PHP_FUNCTION(flock);
 PHP_FUNCTION(fd_set);
 PHP_FUNCTION(fd_isset);
-#if (!defined(PHP_WIN32) && !defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS)
+#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
 PHP_FUNCTION(realpath);
 PHP_FUNCTION(fnmatch);
 #endif