cvs: php4(PHP_4_0_7) / configure.in /ext/standard basic_functions.c file.c file.h

sniper Tue Oct 23 07:18:49 2001 EDT Modified files: (Branch: PHP_4_0_7) /php4 configure.in /php4/ext/standard basic_functions.c file.c file.h Log: MFH Index: php4/configure.in diff -u php4/configure.in:1.268.4.8 php4/configure.in:1.268.4.9 --- php4/configure.in:1.268.4.8 Mon Oct 15 20:07:57 2001 +++ php4/configure.in Tue Oct 23 07:18:46 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.268.4.8 2001/10/16 00:07:57 ssb Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.268.4.9 2001/10/23 11:18:46 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -394,6 +394,7 @@ mmap \ nl_langinfo \ putenv \ +realpath \ random \ rand_r \ regcomp \ Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.385.2.4 php4/ext/standard/basic_functions.c:1.385.2.5 --- php4/ext/standard/basic_functions.c:1.385.2.4 Thu Oct 11 19:52:05 2001 +++ php4/ext/standard/basic_functions.c Tue Oct 23 07:18:46 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.385.2.4 2001/10/11 23:52:05 ssb Exp $ */ +/* $Id: basic_functions.c,v 1.385.2.5 2001/10/23 11:18:46 sniper Exp $ */ #include "php.h" #include "php_main.h" @@ -467,7 +467,7 @@ PHP_FALIAS(socket_set_timeout, warn_not_available, NULL) #endif PHP_FE(socket_get_status, NULL) -#if (!defined(PHP_WIN32) && !defined(__BEOS__)) || defined(ZTS) +#if (!defined(PHP_WIN32) && !defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) PHP_FE(realpath, NULL) #else PHP_FALIAS(realpath, warn_not_available, NULL) Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.183 php4/ext/standard/file.c:1.183.2.1 --- php4/ext/standard/file.c:1.183 Wed Aug 15 01:21:43 2001 +++ php4/ext/standard/file.c Tue Oct 23 07:18:48 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.183 2001/08/15 05:21:43 sterling Exp $ */ +/* $Id: file.c,v 1.183.2.1 2001/10/23 11:18:48 sniper Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -2208,7 +2208,7 @@ /* }}} */ -#if (!defined(PHP_WIN32) && !defined(__BEOS__)) || defined(ZTS) +#if (!defined(PHP_WIN32) && !defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) /* {{{ proto string realpath(string path) Return the resolved path */ PHP_FUNCTION(realpath) Index: php4/ext/standard/file.h diff -u php4/ext/standard/file.h:1.40 php4/ext/standard/file.h:1.40.2.1 --- php4/ext/standard/file.h:1.40 Sat Aug 4 21:42:42 2001 +++ php4/ext/standard/file.h Tue Oct 23 07:18:48 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.h,v 1.40 2001/08/05 01:42:42 zeev Exp $ */ +/* $Id: file.h,v 1.40.2.1 2001/10/23 11:18:48 sniper Exp $ */ /* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */ @@ -63,7 +63,9 @@ PHP_FUNCTION(fd_set); PHP_FUNCTION(fd_isset); PHP_FUNCTION(select); +#if (!defined(PHP_WIN32) && !defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) PHP_FUNCTION(realpath); +#endif PHP_NAMED_FUNCTION(php_if_ftruncate); PHP_NAMED_FUNCTION(php_if_fstat);