CVS update: php3

Date: Wednesday June 16, 1999 @ 7:34 Author: ssb Update of /repository/php3 In directory php:/tmp/cvs-serv14928 Modified Files: config.h.in config.w32.h configure.in debugger.c fopen-wrappers.c list.c main.c makedist php.h php3_realpath.c php_compat.c php_compat.h safe_mode.c tls.h Log Message: changed from #if to #ifdef for HAVE_LINK, HAVE_SYMLINK, HAVE_FLOCK, HAVE_SYS_TIME_H, HAVE_ST_BLKSIZE, HAVE_ST_BLOCKS, HAVE_DIRENT_H, HAVE_GRP_H, HAVE_SYS_FILE_H, HAVE_SYS_SOCKET_H, HAVE_SYS_WAIT_H, HAVE_UNISTD_H, HAVE_CUSERID, HAVE_RINT, HAVE_SIGNAL_H, HAVE_SETLOCALE and HAVE_SYS_RESOURCE_H Index: php3/config.h.in diff -u php3/config.h.in:1.167 php3/config.h.in:1.168 --- php3/config.h.in:1.167 Sat Jun 12 06:28:34 1999 +++ php3/config.h.in Wed Jun 16 07:34:10 1999 @@ -528,6 +528,9 @@ /* Define if you have the <limits.h> header file. */ #undef HAVE_LIMITS_H +/* Define if you have the <locale.h> header file. */ +#undef HAVE_LOCALE_H + /* Define if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H Index: php3/config.w32.h diff -u php3/config.w32.h:1.78 php3/config.w32.h:1.79 --- php3/config.w32.h:1.78 Sun May 23 18:33:51 1999 +++ php3/config.w32.h Wed Jun 16 07:34:11 1999 @@ -66,7 +66,7 @@ ---------------------------------------------------------------*/ /* Define if you have the link function. */ -#define HAVE_LINK 0 +#undef HAVE_LINK /* Define if you have the lockf function. */ /* #undef HAVE_LOCKF */ @@ -78,7 +78,7 @@ /* #undef HAVE_SRAND48 */ /* Define if you have the symlink function. */ -#define HAVE_SYMLINK 0 +#undef HAVE_SYMLINK /* Define if you have the usleep function. */ #define HAVE_USLEEP 1 @@ -114,7 +114,7 @@ #define HAVE_TZSET 1 /* Define if you have the flock function. */ -#define HAVE_FLOCK 0 +#undef HAVE_FLOCK /* Define if using alloca.c. */ /* #undef C_ALLOCA */ @@ -133,7 +133,7 @@ /* #undef HAVE_ALLOCA_H */ /* Define if you have <sys/time.h> */ -#define HAVE_SYS_TIME_H 0 +#undef HAVE_SYS_TIME_H /* Define if you have <signal.h> */ #define HAVE_SIGNAL_H 1 @@ -142,10 +142,10 @@ /* #undef HAVE_DOPRNT */ /* Define if your struct stat has st_blksize. */ -#define HAVE_ST_BLKSIZE 0 +#undef HAVE_ST_BLKSIZE /* Define if your struct stat has st_blocks. */ -#define HAVE_ST_BLOCKS 0 +#undef HAVE_ST_BLOCKS /* Define if your struct stat has st_rdev. */ #define HAVE_ST_RDEV 1 @@ -235,13 +235,13 @@ /* #undef HAVE_CRYPT_H */ /* Define if you have the <dirent.h> header file. */ -#define HAVE_DIRENT_H 0 +#undef HAVE_DIRENT_H /* Define if you have the <fcntl.h> header file. */ #define HAVE_FCNTL_H 1 /* Define if you have the <grp.h> header file. */ -#define HAVE_GRP_H 0 +#undef HAVE_GRP_H /* Define if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 @@ -259,22 +259,22 @@ /* #undef HAVE_SYS_DIR_H */ /* Define if you have the <sys/file.h> header file. */ -#define HAVE_SYS_FILE_H 0 +#undef HAVE_SYS_FILE_H /* Define if you have the <sys/ndir.h> header file. */ /* #undef HAVE_SYS_NDIR_H */ /* Define if you have the <sys/socket.h> header file. */ -#define HAVE_SYS_SOCKET_H 0 +#undef HAVE_SYS_SOCKET_H /* Define if you have the <sys/wait.h> header file. */ -#define HAVE_SYS_WAIT_H 0 +#undef HAVE_SYS_WAIT_H /* Define if you have the <syslog.h> header file. */ #define HAVE_SYSLOG_H 1 /* Define if you have the <unistd.h> header file. */ -#define HAVE_UNISTD_H 0 +#undef HAVE_UNISTD_H /* Define if you have the crypt library (-lcrypt). */ /* #undef HAVE_LIBCRYPT 0 */ @@ -292,7 +292,7 @@ /* #undef HAVE_LIBSOCKET */ /* Define if you have the cuserid function. */ -#define HAVE_CUSERID 0 +#undef HAVE_CUSERID /* Define if you have the rint function. */ #undef HAVE_RINT Index: php3/configure.in diff -u php3/configure.in:1.394 php3/configure.in:1.395 --- php3/configure.in:1.394 Sat Jun 12 14:28:08 1999 +++ php3/configure.in Wed Jun 16 07:34:11 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.394 1999/06/12 18:28:08 jim Exp $ +dnl $Id: configure.in,v 1.395 1999/06/16 11:34:11 ssb Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -154,7 +154,7 @@ fi AC_MISSING_FCLOSE_DECL dnl QNX requires unix.h to allow functions in libunix to work properly -AC_CHECK_HEADERS(fcntl.h unistd.h crypt.h sys/file.h memory.h pwd.h grp.h sys/socket.h sys/wait.h syslog.h string.h sys/varargs.h stdarg.h sys/resource.h sys/time.h signal.h netinet/in.h dlfcn.h limits.h sys/types.h sys/statvfs.h sys/statfs.h unix.h db.h dbm.h ndbm.h) +AC_CHECK_HEADERS(fcntl.h unistd.h crypt.h sys/file.h memory.h pwd.h grp.h sys/socket.h sys/wait.h syslog.h string.h sys/varargs.h stdarg.h sys/resource.h sys/time.h signal.h netinet/in.h dlfcn.h limits.h sys/types.h sys/statvfs.h sys/statfs.h unix.h db.h dbm.h ndbm.h locale.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_STRUCT_TM Index: php3/debugger.c diff -u php3/debugger.c:1.69 php3/debugger.c:1.70 --- php3/debugger.c:1.69 Thu Apr 22 09:19:48 1999 +++ php3/debugger.c Wed Jun 16 07:34:12 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: debugger.c,v 1.69 1999/04/22 13:19:48 ssb Exp $ */ +/* $Id: debugger.c,v 1.70 1999/06/16 11:34:12 ssb Exp $ */ #if THREAD_SAFE #include "tls.h" #endif @@ -57,7 +57,7 @@ # include <netdb.h> #endif -#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H # include <unistd.h> #endif #if HAVE_SYS_TIME_H Index: php3/fopen-wrappers.c diff -u php3/fopen-wrappers.c:1.63 php3/fopen-wrappers.c:1.64 --- php3/fopen-wrappers.c:1.63 Sat Jun 12 16:41:39 1999 +++ php3/fopen-wrappers.c Wed Jun 16 07:34:12 1999 @@ -27,7 +27,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.63 1999/06/12 20:41:39 jim Exp $ */ +/* $Id: fopen-wrappers.c,v 1.64 1999/06/16 11:34:12 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -69,8 +69,8 @@ #endif #include <sys/types.h> -#if HAVE_SYS_SOCKET_H -#include <sys/socket.h> +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> #endif #ifndef S_ISREG Index: php3/list.c diff -u php3/list.c:1.86 php3/list.c:1.87 --- php3/list.c:1.86 Fri Jan 1 12:58:50 1999 +++ php3/list.c Wed Jun 16 07:34:13 1999 @@ -29,7 +29,7 @@ */ -/* $Id: list.c,v 1.86 1999/01/01 17:58:50 zeev Exp $ */ +/* $Id: list.c,v 1.87 1999/06/16 11:34:13 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -40,8 +40,8 @@ #include "functions/db.h" -#if HAVE_DIRENT_H -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> #endif #if MSVC5 Index: php3/main.c diff -u php3/main.c:1.499 php3/main.c:1.500 --- php3/main.c:1.499 Sun Jun 13 10:23:13 1999 +++ php3/main.c Wed Jun 16 07:34:13 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.499 1999/06/13 14:23:13 abelits Exp $ */ +/* $Id: main.c,v 1.500 1999/06/16 11:34:13 ssb Exp $ */ /* #define CRASH_DETECTION */ @@ -49,17 +49,17 @@ #else #include "build-defs.h" #endif -#if HAVE_SYS_TIME_H -#include <sys/time.h> +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> #endif -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif -#if HAVE_SIGNAL_H -#include <signal.h> +#ifdef HAVE_SIGNAL_H +# include <signal.h> #endif -#if HAVE_SETLOCALE -#include <locale.h> +#ifdef HAVE_SETLOCALE +# include <locale.h> #endif #include "language-parser.tab.h" #include "main.h" @@ -1189,7 +1189,7 @@ start_memory_manager(); -#if HAVE_SETLOCALE +#ifdef HAVE_SETLOCALE setlocale(LC_CTYPE, ""); #endif @@ -2021,7 +2021,7 @@ } #endif -#if HAVE_SETLOCALE +#ifdef HAVE_SETLOCALE setlocale(LC_CTYPE, ""); #endif Index: php3/makedist diff -u php3/makedist:1.24 php3/makedist:1.25 --- php3/makedist:1.24 Thu Apr 22 09:19:48 1999 +++ php3/makedist Wed Jun 16 07:34:13 1999 @@ -7,7 +7,7 @@ # <package>_<version> # # where <package> is the package name and the CVS module -# and <version> s the version number with underscores instead of dots. +# and <version> is the version number with underscores instead of dots. # # For example: cvs tag php_3_0a1 # @@ -24,7 +24,7 @@ # # Written by Stig Bakken <ssb@fast.no> 1997-05-28. # -# $Id: makedist,v 1.24 1999/04/22 13:19:48 ssb Exp $ +# $Id: makedist,v 1.25 1999/06/16 11:34:13 ssb Exp $ # CVSROOT=:pserver:cvsread@cvs.php.net:/repository Index: php3/php.h diff -u php3/php.h:1.52 php3/php.h:1.53 --- php3/php.h:1.52 Thu Jun 3 08:03:05 1999 +++ php3/php.h Wed Jun 16 07:34:13 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.52 1999/06/03 12:03:05 sas Exp $ */ +/* $Id: php.h,v 1.53 1999/06/16 11:34:13 ssb Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -136,8 +136,8 @@ #include <stdlib.h> #include <ctype.h> -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #if HAVE_STDARG_H #include <stdarg.h> Index: php3/php3_realpath.c diff -u php3/php3_realpath.c:1.11 php3/php3_realpath.c:1.12 --- php3/php3_realpath.c:1.11 Mon Feb 15 12:25:44 1999 +++ php3/php3_realpath.c Wed Jun 16 07:34:13 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php3_realpath.c,v 1.11 1999/02/15 17:25:44 steffann Exp $ */ +/* $Id: php3_realpath.c,v 1.12 1999/06/16 11:34:13 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -35,8 +35,8 @@ #include "php.h" -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #include <sys/stat.h> @@ -225,7 +225,7 @@ } } -#if HAVE_SYMLINK +#ifdef HAVE_SYMLINK /* We are going to use path_construction, so close it */ *writepos = 0; Index: php3/php_compat.c diff -u php3/php_compat.c:1.1 php3/php_compat.c:1.2 --- php3/php_compat.c:1.1 Sun Feb 28 18:10:56 1999 +++ php3/php_compat.c Wed Jun 16 07:34:13 1999 @@ -26,7 +26,7 @@ | Authors: Sascha Schumann <sas@schell.de> | +----------------------------------------------------------------------+ - $Id: php_compat.c,v 1.1 1999/02/28 23:10:56 zeev Exp $ + $Id: php_compat.c,v 1.2 1999/06/16 11:34:13 ssb Exp $ */ @@ -43,7 +43,7 @@ #include <io.h> #endif -#if !HAVE_FLOCK +#ifndef HAVE_FLOCK PHPAPI int flock(int fd, int operation) #if HAVE_STRUCT_FLOCK { @@ -160,7 +160,7 @@ return 0; } #endif -#endif /* !HAVE_FLOCK */ +#endif /* !defined(HAVE_FLOCK) */ #if !(HAVE_INET_ATON) Index: php3/php_compat.h diff -u php3/php_compat.h:1.2 php3/php_compat.h:1.3 --- php3/php_compat.h:1.2 Fri May 28 06:10:08 1999 +++ php3/php_compat.h Wed Jun 16 07:34:13 1999 @@ -17,7 +17,7 @@ #include <netinet/in.h> #endif -#if !HAVE_FLOCK +#ifndef HAVE_FLOCK #define LOCK_SH 1 #define LOCK_EX 2 Index: php3/safe_mode.c diff -u php3/safe_mode.c:1.27 php3/safe_mode.c:1.28 --- php3/safe_mode.c:1.27 Fri Jan 1 12:58:52 1999 +++ php3/safe_mode.c Wed Jun 16 07:34:13 1999 @@ -26,7 +26,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: safe_mode.c,v 1.27 1999/01/01 17:58:52 zeev Exp $ */ +/* $Id: safe_mode.c,v 1.28 1999/06/16 11:34:13 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -35,8 +35,8 @@ #include <stdio.h> #include <stdlib.h> -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #include <sys/stat.h> #include "functions/pageinfo.h" Index: php3/tls.h diff -u php3/tls.h:1.61 php3/tls.h:1.62 --- php3/tls.h:1.61 Fri Jan 1 12:58:52 1999 +++ php3/tls.h Wed Jun 16 07:34:13 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tls.h,v 1.61 1999/01/01 17:58:52 zeev Exp $ */ +/* $Id: tls.h,v 1.62 1999/06/16 11:34:13 ssb Exp $ */ #ifndef _TLS_H_ #define _TLS_H_ @@ -163,7 +163,7 @@ int CurrentStatLength; #endif struct stat sb; -#if HAVE_SYMLINK +#ifdef HAVE_SYMLINK struct stat lsb; #endif /*formated_print.c*/