stas Tue Sep 30 05:52:11 2003 EDT
Modified files:
/php-src/ext/standard basic_functions.c file.c file.h
Log:
MF4: allow realpath() for win32 non-ZTS
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.628
php-src/ext/standard/basic_functions.c:1.629
--- php-src/ext/standard/basic_functions.c:1.628 Tue Sep 23 13:37:29 2003
+++ php-src/ext/standard/basic_functions.c Tue Sep 30 05:52:10 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.628 2003/09/23 17:37:29 andrey Exp $ */
+/* $Id: basic_functions.c,v 1.629 2003/09/30 09:52:10 stas Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -740,7 +740,7 @@
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
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.358 php-src/ext/standard/file.c:1.359
--- php-src/ext/standard/file.c:1.358 Tue Sep 9 21:07:01 2003
+++ php-src/ext/standard/file.c Tue Sep 30 05:52:10 2003
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.358 2003/09/10 01:07:01 iliaa Exp $ */
+/* $Id: file.c,v 1.359 2003/09/30 09:52:10 stas Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1925,7 +1925,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.85 php-src/ext/standard/file.h:1.86
--- php-src/ext/standard/file.h:1.85 Sun Jun 15 19:27:05 2003
+++ php-src/ext/standard/file.h Tue Sep 30 05:52:11 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.h,v 1.85 2003/06/15 23:27:05 edink Exp $ */
+/* $Id: file.h,v 1.86 2003/09/30 09:52:11 stas Exp $ */
/* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */
@@ -59,7 +59,7 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
