From: Stanislav Malyshev <stas@php.net>
Date: Mon, 29 Sep 2003 14:04:16 +0000 (+0000)
Subject: allow realpath() for win32 non-ZTS
X-Git-Tag: php-4.3.4RC1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb9b99262e4ab7a67924c71fec17d5a1125fce67;p=php

allow realpath() for win32 non-ZTS
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 60579ab988..7f56d7b277 100644
--- 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 5f31813c54..8470e5c409 100644
--- 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 cd416bcc60..5bee48c7ea 100644
--- 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);