allow realpath() for win32 non-ZTS

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 60579ab988762fd2c7f72e66881e5bfa5d656f6e..7f56d7b277574442c91019e3b4e72d3fa75f7f6f 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -675,7 +675,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 5f31813c54ab43c3482bf9c1a04414bd2afb7b60..8470e5c409dd5d3c4d0411cac772e7e9150e195d 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -2364,7 +2364,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 cd416bcc60ffc65dc37b41bab5a3579f0da8c0b5..5bee48c7ea0f89df07162b4f1568b551c0053980 100644 (file)
--- a/ext/standard/file.h
+++ b/ext/standard/file.h
@@ -63,8 +63,10 @@ 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);
+#endif
+#ifdef HAVE_FNMATCH
 PHP_FUNCTION(fnmatch);
 #endif
 PHP_NAMED_FUNCTION(php_if_ftruncate);