CVS update: php3/functions

Date: Wednesday June 16, 1999 @ 7:34 Author: ssb Update of /repository/php3/functions In directory php:/tmp/cvs-serv14928/functions Modified Files: apache.c basic_functions.c cpdf.c crypt.c cyr_convert.c db.c dir.c dns.c exec.c fdf.c fhttpd.c file.c filestat.c fsock.c gd.c image.c link.c microtime.c pageinfo.c pdf.c quot_print.c snmp.c string.c syslog.c uniqid.c var.c zlib.c 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/functions/apache.c diff -u php3/functions/apache.c:1.47 php3/functions/apache.c:1.48 --- php3/functions/apache.c:1.47 Tue May 11 08:11:40 1999 +++ php3/functions/apache.c Wed Jun 16 07:34:17 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: apache.c,v 1.47 1999/05/11 12:11:40 rasmus Exp $ */ +/* $Id: apache.c,v 1.48 1999/06/16 11:34:17 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -38,8 +38,8 @@ #include "functions/head.h" #include <stdlib.h> -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #include <string.h> #include <errno.h> Index: php3/functions/basic_functions.c diff -u php3/functions/basic_functions.c:1.264 php3/functions/basic_functions.c:1.265 --- php3/functions/basic_functions.c:1.264 Wed Jun 2 19:53:16 1999 +++ php3/functions/basic_functions.c Wed Jun 16 07:34:17 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.264 1999/06/02 23:53:16 cmv Exp $ */ +/* $Id: basic_functions.c,v 1.265 1999/06/16 11:34:17 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -44,8 +44,8 @@ #include <math.h> #include <time.h> #include <stdio.h> -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #if HAVE_STRING_H #include <string.h> Index: php3/functions/cpdf.c diff -u php3/functions/cpdf.c:1.11 php3/functions/cpdf.c:1.12 --- php3/functions/cpdf.c:1.11 Tue Jun 8 05:16:34 1999 +++ php3/functions/cpdf.c Wed Jun 16 07:34:17 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cpdf.c,v 1.11 1999/06/08 09:16:34 steinm Exp $ */ +/* $Id: cpdf.c,v 1.12 1999/06/16 11:34:17 ssb Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -48,10 +48,7 @@ #include "gd.h" #endif -#if HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif -#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H # include <unistd.h> #endif #if WIN32|WINNT Index: php3/functions/crypt.c diff -u php3/functions/crypt.c:1.45 php3/functions/crypt.c:1.46 --- php3/functions/crypt.c:1.45 Fri Jun 11 08:17:47 1999 +++ php3/functions/crypt.c Wed Jun 16 07:34:17 1999 @@ -28,7 +28,7 @@ | Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: crypt.c,v 1.45 1999/06/11 12:17:47 rasmus Exp $ */ +/* $Id: crypt.c,v 1.46 1999/06/16 11:34:17 ssb Exp $ */ #include <stdlib.h> #include "php.h" @@ -36,8 +36,8 @@ #if HAVE_CRYPT -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #if HAVE_CRYPT_H #include <crypt.h> Index: php3/functions/cyr_convert.c diff -u php3/functions/cyr_convert.c:1.5 php3/functions/cyr_convert.c:1.6 --- php3/functions/cyr_convert.c:1.5 Fri Jan 1 12:59:07 1999 +++ php3/functions/cyr_convert.c Wed Jun 16 07:34:17 1999 @@ -27,12 +27,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: cyr_convert.c,v 1.5 1999/01/01 17:59:07 zeev Exp $ */ +/* $Id: cyr_convert.c,v 1.6 1999/06/16 11:34:17 ssb Exp $ */ #include <stdlib.h> #ifdef HAVE_UNISTD_H -#include <unistd.h> +# include <unistd.h> #endif #include <string.h> #include <errno.h> Index: php3/functions/db.c diff -u php3/functions/db.c:1.90 php3/functions/db.c:1.91 --- php3/functions/db.c:1.90 Sun Mar 21 13:13:19 1999 +++ php3/functions/db.c Wed Jun 16 07:34:17 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.90 1999/03/21 18:13:19 jimjag Exp $ */ +/* $Id: db.c,v 1.91 1999/06/16 11:34:17 ssb Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL #ifdef PHP_31 @@ -51,16 +51,16 @@ #include <stdlib.h> #include <string.h> #include <errno.h> -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #if HAVE_FCNTL_H #include <fcntl.h> #endif -#if HAVE_SYS_FILE_H -#include <sys/file.h> +#ifdef HAVE_SYS_FILE_H +# include <sys/file.h> #endif #if GDBM Index: php3/functions/dir.c diff -u php3/functions/dir.c:1.58 php3/functions/dir.c:1.59 --- php3/functions/dir.c:1.58 Sun May 16 11:45:57 1999 +++ php3/functions/dir.c Wed Jun 16 07:34:18 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.58 1999/05/16 15:45:57 ssb Exp $ */ +/* $Id: dir.c,v 1.59 1999/06/16 11:34:18 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -39,12 +39,12 @@ #include "php3_dir.h" -#if HAVE_DIRENT_H -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> #endif -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #include <errno.h> Index: php3/functions/dns.c diff -u php3/functions/dns.c:1.53 php3/functions/dns.c:1.54 --- php3/functions/dns.c:1.53 Sat Feb 27 12:03:50 1999 +++ php3/functions/dns.c Wed Jun 16 07:34:18 1999 @@ -28,14 +28,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: dns.c,v 1.53 1999/02/27 17:03:50 sas Exp $ */ +/* $Id: dns.c,v 1.54 1999/06/16 11:34:18 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif #include "php.h" -#if HAVE_SYS_SOCKET_H -#include <sys/socket.h> +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> #endif #if WIN32|WINNT #if HAVE_BINDLIB Index: php3/functions/exec.c diff -u php3/functions/exec.c:1.82 php3/functions/exec.c:1.83 --- php3/functions/exec.c:1.82 Sun Jan 31 09:40:14 1999 +++ php3/functions/exec.c Wed Jun 16 07:34:18 1999 @@ -26,7 +26,7 @@ | Author: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: exec.c,v 1.82 1999/01/31 14:40:14 rasmus Exp $ */ +/* $Id: exec.c,v 1.83 1999/06/16 11:34:18 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -40,8 +40,8 @@ #include "head.h" #include "exec.h" -#if HAVE_SYS_WAIT_H -#include <sys/wait.h> +#ifdef HAVE_SYS_WAIT_H +# include <sys/wait.h> #endif /* @@ -183,7 +183,7 @@ } ret = pclose(fp); -#if HAVE_SYS_WAIT_H +#ifdef HAVE_SYS_WAIT_H if (WIFEXITED(ret)) { ret = WEXITSTATUS(ret); } Index: php3/functions/fdf.c diff -u php3/functions/fdf.c:1.4 php3/functions/fdf.c:1.5 --- php3/functions/fdf.c:1.4 Sun May 16 11:38:01 1999 +++ php3/functions/fdf.c Wed Jun 16 07:34:18 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.4 1999/05/16 15:38:01 rasmus Exp $ */ +/* $Id: fdf.c,v 1.5 1999/06/16 11:34:18 ssb Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -45,10 +45,10 @@ #include <math.h> #include "php3_fdf.h" -#if HAVE_SYS_WAIT_H +#ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif -#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H # include <unistd.h> #endif #if WIN32|WINNT Index: php3/functions/fhttpd.c diff -u php3/functions/fhttpd.c:1.9 php3/functions/fhttpd.c:1.10 --- php3/functions/fhttpd.c:1.9 Fri Jan 1 12:59:09 1999 +++ php3/functions/fhttpd.c Wed Jun 16 07:34:18 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fhttpd.c,v 1.9 1999/01/01 17:59:09 zeev Exp $ */ +/* $Id: fhttpd.c,v 1.10 1999/06/16 11:34:18 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -35,8 +35,8 @@ #include "internal_functions.h" #include <stdlib.h> -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #include <string.h> #include <errno.h> Index: php3/functions/file.c diff -u php3/functions/file.c:1.217 php3/functions/file.c:1.218 --- php3/functions/file.c:1.217 Sun Jun 13 06:07:39 1999 +++ php3/functions/file.c Wed Jun 16 07:34:18 1999 @@ -26,7 +26,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.217 1999/06/13 10:07:39 sas Exp $ */ +/* $Id: file.c,v 1.218 1999/06/16 11:34:18 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -62,15 +62,15 @@ #include <pwd.h> #endif #endif -#if HAVE_SYS_TIME_H -#include <sys/time.h> +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> #endif -#if MSVC5 -#include <winsock.h> +#if WIN32|WINNT +# include <winsock.h> #else -#include <netinet/in.h> -#include <netdb.h> -#include <arpa/inet.h> +# include <netinet/in.h> +# include <netdb.h> +# include <arpa/inet.h> #endif #include "snprintf.h" #include "fsock.h" @@ -78,8 +78,8 @@ #include "php_compat.h" -#if HAVE_SYS_FILE_H -#include <sys/file.h> +#ifdef HAVE_SYS_FILE_H +# include <sys/file.h> #endif #if MISSING_FCLOSE_DECL @@ -213,7 +213,7 @@ PHP_FE(fgetcsv, NULL) PHP_FE(get_meta_tags, NULL) PHP_FE(set_socket_blocking, NULL) -#if (0 && HAVE_SYS_TIME_H && HAVE_SETSOCKOPT && defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO)) +#if (0 && defined(HAVE_SYS_TIME_H) && HAVE_SETSOCKOPT && defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO)) PHP_FE(set_socket_timeout, NULL) #endif {NULL, NULL, NULL} @@ -719,7 +719,7 @@ /* }}} */ -#if (0 && HAVE_SYS_TIME_H && HAVE_SETSOCKOPT && defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO)) +#if (0 && defined(HAVE_SYS_TIME_H) && HAVE_SETSOCKOPT && defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO)) /* this doesn't work, as it appears those properties are read-only :( */ void php3_set_socket_timeout(INTERNAL_FUNCTION_PARAMETERS) { Index: php3/functions/filestat.c diff -u php3/functions/filestat.c:1.87 php3/functions/filestat.c:1.88 --- php3/functions/filestat.c:1.87 Mon Mar 1 13:33:53 1999 +++ php3/functions/filestat.c Wed Jun 16 07:34:19 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filestat.c,v 1.87 1999/03/01 18:33:53 sas Exp $ */ +/* $Id: filestat.c,v 1.88 1999/06/16 11:34:19 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -43,7 +43,7 @@ #include <ctype.h> #include <time.h> -#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -61,7 +61,7 @@ # endif #endif -#if HAVE_GRP_H +#ifdef HAVE_GRP_H # if MSVC5 # include "win32/grp.h" # else @@ -87,7 +87,7 @@ static int CurrentStatLength=0; # endif static struct stat sb; -#if HAVE_SYMLINK +#ifdef HAVE_SYMLINK static struct stat lsb; #endif #endif @@ -395,7 +395,7 @@ } else { strcpy(GLOBAL(CurrentStatFile),filename); } -#if HAVE_SYMLINK +#ifdef HAVE_SYMLINK GLOBAL(lsb).st_mode = 0; /* mark lstat buf invalid */ #endif if (stat(GLOBAL(CurrentStatFile),&GLOBAL(sb))==-1) { @@ -408,7 +408,7 @@ } } -#if HAVE_SYMLINK +#ifdef HAVE_SYMLINK if (8 == type /* filetype */ || 14 == type /* is link */ || 16 == type) { /* lstat */ @@ -442,7 +442,7 @@ case 7: /* filectime */ RETURN_LONG((long)GLOBAL(sb).st_ctime); case 8: /* filetype */ -#if HAVE_SYMLINK +#ifdef HAVE_SYMLINK if (S_ISLNK(GLOBAL(lsb).st_mode)) { RETURN_STRING("link",1); } @@ -467,7 +467,7 @@ case 13: /*is dir*/ RETURN_LONG(S_ISDIR(GLOBAL(sb).st_mode)); case 14: /*is link*/ -#if HAVE_SYMLINK +#ifdef HAVE_SYMLINK RETURN_LONG(S_ISLNK(GLOBAL(lsb).st_mode)); #else RETURN_FALSE; @@ -475,7 +475,7 @@ case 15: /*file exists*/ RETURN_TRUE; /* the false case was done earlier */ case 16: /* lstat */ -#if HAVE_SYMLINK +#ifdef HAVE_SYMLINK stat_sb = &GLOBAL(lsb); #endif /* FALLTHROUGH */ @@ -498,12 +498,12 @@ add_next_index_long(return_value, stat_sb->st_atime); add_next_index_long(return_value, stat_sb->st_mtime); add_next_index_long(return_value, stat_sb->st_ctime); -#if HAVE_ST_BLKSIZE +#ifdef HAVE_ST_BLKSIZE add_next_index_long(return_value, stat_sb->st_blksize); #else add_next_index_long(return_value, -1); #endif -#if HAVE_ST_BLOCKS +#ifdef HAVE_ST_BLOCKS add_next_index_long(return_value, stat_sb->st_blocks); #else add_next_index_long(return_value, -1); Index: php3/functions/fsock.c diff -u php3/functions/fsock.c:1.118 php3/functions/fsock.c:1.119 --- php3/functions/fsock.c:1.118 Wed Jun 16 05:57:41 1999 +++ php3/functions/fsock.c Wed Jun 16 07:34:19 1999 @@ -27,7 +27,7 @@ | Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.118 1999/06/16 09:57:41 ssb Exp $ */ +/* $Id: fsock.c,v 1.119 1999/06/16 11:34:19 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -37,7 +37,7 @@ #include <stdlib.h> #include <stddef.h> #ifdef HAVE_UNISTD_H -#include <unistd.h> +# include <unistd.h> #endif #ifdef HAVE_FCNTL_H @@ -45,26 +45,26 @@ #endif #ifdef HAVE_SYS_TIME_H -#include <sys/time.h> +# include <sys/time.h> #endif #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> +# include <sys/socket.h> #endif #ifdef WIN32 -#define WINNT 1 -#include <winsock.h> +# define WINNT 1 +# include <winsock.h> #else -#include <netinet/in.h> -#include <netdb.h> +# include <netinet/in.h> +# include <netdb.h> #endif #include <arpa/inet.h> #ifdef WIN32 -#undef AF_UNIX +# undef AF_UNIX #endif #if defined(AF_UNIX) -#include <sys/un.h> +# include <sys/un.h> #endif #include <string.h> Index: php3/functions/gd.c diff -u php3/functions/gd.c:1.123 php3/functions/gd.c:1.124 --- php3/functions/gd.c:1.123 Tue Jun 1 18:04:25 1999 +++ php3/functions/gd.c Wed Jun 16 07:34:21 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.123 1999/06/01 22:04:25 jah Exp $ */ +/* $Id: gd.c,v 1.124 1999/06/16 11:34:21 ssb Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -50,10 +50,7 @@ #include <math.h> #include "php3_gd.h" -#if HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif -#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H # include <unistd.h> #endif #if WIN32|WINNT Index: php3/functions/image.c diff -u php3/functions/image.c:1.48 php3/functions/image.c:1.49 --- php3/functions/image.c:1.48 Sun May 2 11:27:42 1999 +++ php3/functions/image.c Wed Jun 16 07:34:21 1999 @@ -26,7 +26,7 @@ | Authors: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ -/* $Id: image.c,v 1.48 1999/05/02 15:27:42 thies Exp $ */ +/* $Id: image.c,v 1.49 1999/06/16 11:34:21 ssb Exp $ */ /* * Based on Daniel Schmitt's imageinfo.c which carried the following * Copyright notice. @@ -54,8 +54,8 @@ #endif #include "internal_functions.h" #include "fopen-wrappers.h" -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #include "image.h" Index: php3/functions/link.c diff -u php3/functions/link.c:1.35 php3/functions/link.c:1.36 --- php3/functions/link.c:1.35 Fri Jan 1 12:59:12 1999 +++ php3/functions/link.c Wed Jun 16 07:34:21 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: link.c,v 1.35 1999/01/01 17:59:12 zeev Exp $ */ +/* $Id: link.c,v 1.36 1999/06/16 11:34:21 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -37,8 +37,8 @@ #include "php3_filestat.h" #include <stdlib.h> -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #include <sys/stat.h> #include <string.h> @@ -49,12 +49,12 @@ #include <pwd.h> #endif #endif -#if HAVE_GRP_H -#if MSVC5 -#include "win32/grp.h" -#else -#include <grp.h> -#endif +#ifdef HAVE_GRP_H +# if MSVC5 +# include "win32/grp.h" +# else +# include <grp.h> +# endif #endif #include <errno.h> #include <ctype.h> @@ -66,7 +66,7 @@ Return the target of a symbolic link */ void php3_readlink(INTERNAL_FUNCTION_PARAMETERS) { -#if HAVE_SYMLINK +#ifdef HAVE_SYMLINK pval *filename; char buff[256]; int ret; @@ -92,7 +92,7 @@ Returns the st_dev field of the UNIX C stat structure describing the link */ void php3_linkinfo(INTERNAL_FUNCTION_PARAMETERS) { -#if HAVE_SYMLINK +#ifdef HAVE_SYMLINK pval *filename; struct stat sb; int ret; @@ -116,7 +116,7 @@ Create a symbolic link */ void php3_symlink(INTERNAL_FUNCTION_PARAMETERS) { -#if HAVE_SYMLINK +#ifdef HAVE_SYMLINK pval *topath, *frompath; int ret; @@ -144,7 +144,7 @@ Create a hard link */ void php3_link(INTERNAL_FUNCTION_PARAMETERS) { -#if HAVE_LINK +#ifdef HAVE_LINK pval *topath, *frompath; int ret; Index: php3/functions/microtime.c diff -u php3/functions/microtime.c:1.30 php3/functions/microtime.c:1.31 --- php3/functions/microtime.c:1.30 Tue May 18 08:56:39 1999 +++ php3/functions/microtime.c Wed Jun 16 07:34:21 1999 @@ -27,18 +27,18 @@ +----------------------------------------------------------------------+ */ -/* $Id: microtime.c,v 1.30 1999/05/18 12:56:39 sas Exp $ */ +/* $Id: microtime.c,v 1.31 1999/06/16 11:34:21 ssb Exp $ */ #include "php.h" #include <stdlib.h> -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif -#if HAVE_SYS_TIME_H -#include <sys/time.h> +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> #endif -#if HAVE_SYS_RESOURCE_H -#include <sys/resource.h> +#ifdef HAVE_SYS_RESOURCE_H +# include <sys/resource.h> #endif #include <string.h> #include <errno.h> Index: php3/functions/pageinfo.c diff -u php3/functions/pageinfo.c:1.40 php3/functions/pageinfo.c:1.41 --- php3/functions/pageinfo.c:1.40 Fri Jan 1 12:59:14 1999 +++ php3/functions/pageinfo.c Wed Jun 16 07:34:22 1999 @@ -26,7 +26,7 @@ | Authors: Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: pageinfo.c,v 1.40 1999/01/01 17:59:14 zeev Exp $ */ +/* $Id: pageinfo.c,v 1.41 1999/06/16 11:34:22 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -42,8 +42,8 @@ #include <pwd.h> #endif #endif -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #include <sys/stat.h> #if MSVC5 Index: php3/functions/pdf.c diff -u php3/functions/pdf.c:1.32 php3/functions/pdf.c:1.33 --- php3/functions/pdf.c:1.32 Tue Jun 8 05:16:34 1999 +++ php3/functions/pdf.c Wed Jun 16 07:34:22 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.32 1999/06/08 09:16:34 steinm Exp $ */ +/* $Id: pdf.c,v 1.33 1999/06/16 11:34:22 ssb Exp $ */ /* pdflib 0.6 is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997 Thomas Merz. */ @@ -48,10 +48,7 @@ #include "gd.h" #endif -#if HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif -#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H # include <unistd.h> #endif #if WIN32|WINNT Index: php3/functions/quot_print.c diff -u php3/functions/quot_print.c:1.5 php3/functions/quot_print.c:1.6 --- php3/functions/quot_print.c:1.5 Fri Jan 1 12:59:17 1999 +++ php3/functions/quot_print.c Wed Jun 16 07:34:22 1999 @@ -27,12 +27,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: quot_print.c,v 1.5 1999/01/01 17:59:17 zeev Exp $ */ +/* $Id: quot_print.c,v 1.6 1999/06/16 11:34:22 ssb Exp $ */ #include <stdlib.h> #ifdef HAVE_UNISTD_H -#include <unistd.h> +# include <unistd.h> #endif #include <string.h> #include <errno.h> Index: php3/functions/snmp.c diff -u php3/functions/snmp.c:1.14 php3/functions/snmp.c:1.15 --- php3/functions/snmp.c:1.14 Sat May 22 10:38:40 1999 +++ php3/functions/snmp.c Wed Jun 16 07:34:22 1999 @@ -27,7 +27,7 @@ | Mike Jackson <mhjack@tscnet.com> | +----------------------------------------------------------------------+ */ -/* $Id: snmp.c,v 1.14 1999/05/22 14:38:40 rasmus Exp $ */ +/* $Id: snmp.c,v 1.15 1999/06/16 11:34:22 ssb Exp $ */ #include "php.h" #include "internal_functions.h" @@ -54,7 +54,7 @@ #include <netdb.h> #endif #ifdef HAVE_UNISTD_H -#include <unistd.h> +# include <unistd.h> #endif #if HAVE_SNMP Index: php3/functions/string.c diff -u php3/functions/string.c:1.192 php3/functions/string.c:1.193 --- php3/functions/string.c:1.192 Sat May 22 18:34:56 1999 +++ php3/functions/string.c Wed Jun 16 07:34:22 1999 @@ -30,7 +30,7 @@ */ -/* $Id: string.c,v 1.192 1999/05/22 22:34:56 sas Exp $ */ +/* $Id: string.c,v 1.193 1999/06/16 11:34:22 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -40,8 +40,8 @@ #include "reg.h" #include "post.h" #include "php3_string.h" -#if HAVE_SETLOCALE -#include <locale.h> +#ifdef HAVE_LOCALE_H +# include <locale.h> #endif static char hexconvtab[] = "0123456789abcdef"; @@ -1787,7 +1787,7 @@ if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &category, &locale)==FAILURE) WRONG_PARAM_COUNT; -#if HAVE_SETLOCALE +#ifdef HAVE_SETLOCALE convert_to_string(category); convert_to_string(locale); if (!strcasecmp ("LC_ALL", category->value.str.val)) Index: php3/functions/syslog.c diff -u php3/functions/syslog.c:1.44 php3/functions/syslog.c:1.45 --- php3/functions/syslog.c:1.44 Thu Apr 22 09:19:51 1999 +++ php3/functions/syslog.c Wed Jun 16 07:34:22 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: syslog.c,v 1.44 1999/04/22 13:19:51 ssb Exp $ */ +/* $Id: syslog.c,v 1.45 1999/06/16 11:34:22 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -35,8 +35,8 @@ #include "internal_functions.h" #include <stdlib.h> -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #if MSVC5 #include "win32/syslog.h" Index: php3/functions/uniqid.c diff -u php3/functions/uniqid.c:1.33 php3/functions/uniqid.c:1.34 --- php3/functions/uniqid.c:1.33 Thu Apr 22 09:19:51 1999 +++ php3/functions/uniqid.c Wed Jun 16 07:34:22 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: uniqid.c,v 1.33 1999/04/22 13:19:51 ssb Exp $ */ +/* $Id: uniqid.c,v 1.34 1999/06/16 11:34:22 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -35,8 +35,8 @@ #include "internal_functions.h" #include <stdlib.h> -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #include <string.h> Index: php3/functions/var.c diff -u php3/functions/var.c:1.13 php3/functions/var.c:1.14 --- php3/functions/var.c:1.13 Fri Jan 8 09:14:56 1999 +++ php3/functions/var.c Wed Jun 16 07:34:22 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.13 1999/01/08 14:14:56 rasmus Exp $ */ +/* $Id: var.c,v 1.14 1999/06/16 11:34:22 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -42,8 +42,8 @@ #include "reg.h" #include "post.h" #include "php3_string.h" -#if HAVE_SETLOCALE -#include <locale.h> +#ifdef HAVE_LOCALE_H +# include <locale.h> #endif #include "php3_var.h" Index: php3/functions/zlib.c diff -u php3/functions/zlib.c:1.15 php3/functions/zlib.c:1.16 --- php3/functions/zlib.c:1.15 Sun May 16 11:44:57 1999 +++ php3/functions/zlib.c Wed Jun 16 07:34:22 1999 @@ -22,7 +22,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.15 1999/05/16 15:44:57 ssb Exp $ */ +/* $Id: zlib.c,v 1.16 1999/06/16 11:34:22 ssb Exp $ */ #if !PHP_31 && defined(THREAD_SAFE) #undef THREAD_SAFE #endif @@ -73,7 +73,7 @@ #include "snprintf.h" #if HAVE_ZLIB #if defined(HAVE_UNISTD_H) && (WIN32|WINNT) -#undef HAVE_UNISTD_H +# undef HAVE_UNISTD_H #endif #include <zlib.h>