stas Mon Sep 29 10:04:16 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard file.c file.h
Log:
allow realpath() for win32 non-ZTS
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.279.2.36 php-src/ext/standard/file.c:1.279.2.37
--- php-src/ext/standard/file.c:1.279.2.36 Tue Sep 9 21:03:41 2003
+++ php-src/ext/standard/file.c Mon Sep 29 10:04:16 2003
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.279.2.36 2003/09/10 01:03:41 iliaa Exp $ */
+/* $Id: file.c,v 1.279.2.37 2003/09/29 14:04:16 stas Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2364,7 +2364,7 @@
/* }}} */
-#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)
Index: php-src/ext/standard/file.h
diff -u php-src/ext/standard/file.h:1.70.2.4 php-src/ext/standard/file.h:1.70.2.5
--- php-src/ext/standard/file.h:1.70.2.4 Sun Jun 29 19:29:49 2003
+++ php-src/ext/standard/file.h Mon Sep 29 10:04:16 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.h,v 1.70.2.4 2003/06/29 23:29:49 edink Exp $ */
+/* $Id: file.h,v 1.70.2.5 2003/09/29 14:04:16 stas Exp $ */
/* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */
@@ -63,8 +63,10 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
