[PHP4BETA] CVS update: php4/functions

Date: Wednesday April 21, 1999 @ 14:07 Author: sas Update of /repository/php4/functions In directory php:/tmp/cvs-serv3293 Modified Files: db.c Added Files: php3_crypt.h Log Message: cleanup, flock() support Index: php4/functions/db.c diff -c php4/functions/db.c:1.4 php4/functions/db.c:1.5 *** php4/functions/db.c:1.4 Sat Apr 10 12:25:24 1999 --- php4/functions/db.c Wed Apr 21 14:07:23 1999 *************** *** 28,34 **** +----------------------------------------------------------------------+ */ ! /* $Id: db.c,v 1.4 1999/04/10 16:25:24 zeev Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL #ifdef PHP_31 --- 28,34 ---- +----------------------------------------------------------------------+ */ ! /* $Id: db.c,v 1.5 1999/04/21 18:07:23 sas Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL #ifdef PHP_31 *************** *** 58,65 **** #ifdef PHP_31 #include "os/nt/flock.h" #else - #if HAVE_SYS_FILE_H && !HAVE_LOCKF && HAVE_FLOCK - #endif #if WIN32|WINNT #include "win32/flock.h" #else --- 58,63 ---- *************** *** 361,373 **** 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); --- 359,365 ---- *************** *** 460,472 **** #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); } #endif --- 452,458 ---- -- PHP 4 Beta