CVS update: php3/dl/log

Date: Wednesday June 16, 1999 @ 7:34 Author: ssb Update of /repository/php3/dl/log In directory php:/tmp/cvs-serv14928/dl/log Modified Files: log.c log_db.c log_sql.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/dl/log/log.c diff -u php3/dl/log/log.c:1.11 php3/dl/log/log.c:1.12 --- php3/dl/log/log.c:1.11 Tue Nov 3 10:52:31 1998 +++ php3/dl/log/log.c Wed Jun 16 07:34:15 1999 @@ -27,15 +27,15 @@ +----------------------------------------------------------------------+ */ -/* $Id: log.c,v 1.11 1998/11/03 15:52:31 rasmus Exp $ */ +/* $Id: log.c,v 1.12 1999/06/16 11:34:15 ssb Exp $ */ #include "phpdl.h" #include "log.h" #include <stdlib.h> -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #include <time.h> Index: php3/dl/log/log_db.c diff -u php3/dl/log/log_db.c:1.5 php3/dl/log/log_db.c:1.6 --- php3/dl/log/log_db.c:1.5 Thu May 21 19:57:18 1998 +++ php3/dl/log/log_db.c Wed Jun 16 07:34:15 1999 @@ -27,15 +27,15 @@ +----------------------------------------------------------------------+ */ -/* $Id: log_db.c,v 1.5 1998/05/21 23:57:18 zeev Exp $ */ +/* $Id: log_db.c,v 1.6 1999/06/16 11:34:15 ssb Exp $ */ #include "phpdl.h" #include "log.h" #include <stdlib.h> -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #include <sys/stat.h> Index: php3/dl/log/log_sql.c diff -u php3/dl/log/log_sql.c:1.5 php3/dl/log/log_sql.c:1.6 --- php3/dl/log/log_sql.c:1.5 Thu May 21 19:57:18 1998 +++ php3/dl/log/log_sql.c Wed Jun 16 07:34:15 1999 @@ -27,23 +27,23 @@ +----------------------------------------------------------------------+ */ -/* $Id: log_sql.c,v 1.5 1998/05/21 23:57:18 zeev Exp $ */ +/* $Id: log_sql.c,v 1.6 1999/06/16 11:34:15 ssb Exp $ */ #include "phpdl.h" #include <stdlib.h> -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif -#if HAVE_SYS_FILE_H -#if !HAVE_LOCKF -#if HAVE_FLOCK -#include <sys/file.h> +#ifdef HAVE_SYS_FILE_H +# ifndef HAVE_LOCKF +# ifdef HAVE_FLOCK +# include <sys/file.h> +# endif +# endif #endif -#endif -#endif #include <time.h> #include <errno.h> @@ -208,10 +208,10 @@ /* Lock database */ lockfd = open(lockfn,O_RDWR|O_CREAT,0644); if (lockfd) { -#if HAVE_LOCKF +#ifdef HAVE_LOCKF lockf(lockfd,F_LOCK,0); #else -#if HAVE_FLOCK +#ifdef HAVE_FLOCK flock(lockfd,LOCK_EX); #endif #endif @@ -336,13 +336,13 @@ #endif } -#if HAVE_LOCKF +#ifdef HAVE_LOCKF #if MSQLLOGGING lockf(lockfd,F_ULOCK,0); close(lockfd); #endif #else -#if HAVE_FLOCK +#ifdef HAVE_FLOCK #if MSQLLOGGING flock(lockfd,LOCK_UN); close(lockfd);