CVS update: php3/functions

Date: Thursday February 4, 1999 @ 13:28 Author: sas Update of /repository/php3/functions In directory asf:/u/temp/cvs-serv21686/functions Modified Files: db.c Log Message: Portability clean ups Index: php3/functions/db.c diff -c php3/functions/db.c:1.83 php3/functions/db.c:1.84 *** php3/functions/db.c:1.83 Mon Jan 4 09:25:19 1999 --- php3/functions/db.c Thu Feb 4 13:28:03 1999 *************** *** 28,34 **** +----------------------------------------------------------------------+ */ ! /* $Id: db.c,v 1.83 1999/01/04 14:25:19 jah Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL #ifdef PHP_31 --- 28,34 ---- +----------------------------------------------------------------------+ */ ! /* $Id: db.c,v 1.84 1999/02/04 18:28:03 sas Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL #ifdef PHP_31 *************** *** 54,71 **** #include <unistd.h> #endif - #if HAVE_SYS_FILE_H && !HAVE_LOCKF && HAVE_FLOCK - #if WIN32|WINNT - #ifdef PHP_31 - #include "os/nt/flock.h" - #else - #include "win32/flock.h" - #endif - #else - #include <sys/file.h> - #endif - #endif - #if HAVE_FCNTL_H #include <fcntl.h> #endif --- 54,59 ---- *************** *** 367,379 **** lockfd = open(lockfn,O_RDWR|O_CREAT,0644); if (lockfd) { - #if HAVE_LOCKF - lockf(lockfd,F_LOCK,0); - #else - #if HAVE_FLOCK flock(lockfd,LOCK_EX); - #endif - #endif close(lockfd); } else { php3_error(E_WARNING, "Unable to establish lock: %s",filename); --- 355,361 ---- *************** *** 469,480 **** #else if (info->lockfn) { lockfd = open(info->lockfn,O_RDWR,0644); - #if HAVE_LOCKF - lockf(lockfd,F_ULOCK,0); - #else - # if HAVE_FLOCK flock(lockfd,LOCK_UN); - # endif #endif close(lockfd); } --- 451,457 ---- -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net