CVS update: php3

Date: Wednesday February 10, 1999 @ 1:24 Author: fmk Update of /repository/php3 In directory asf:/u/temp/cvs-serv18619 Modified Files: compat.c Log Message: Renaming op to operation in order to compile on Windows NT Index: php3/compat.c diff -c php3/compat.c:1.2 php3/compat.c:1.3 *** php3/compat.c:1.2 Thu Feb 4 13:28:04 1999 --- php3/compat.c Wed Feb 10 01:24:10 1999 *************** *** 26,32 **** | Authors: Sascha Schumann <sas@schell.de> | +----------------------------------------------------------------------+ ! $Id: compat.c,v 1.2 1999/02/04 18:28:04 sas Exp $ */ --- 26,32 ---- | Authors: Sascha Schumann <sas@schell.de> | +----------------------------------------------------------------------+ ! $Id: compat.c,v 1.3 1999/02/10 06:24:10 fmk Exp $ */ *************** *** 128,142 **** return -1; /* error in file descriptor */ /* bug for bug compatible with Unix */ UnlockFileEx(hdl, 0, low, high, &offset); ! switch (op & ~LOCK_NB) { /* translate to LockFileEx() op */ case LOCK_EX: /* exclusive */ if (LockFileEx(hdl, LOCKFILE_EXCLUSIVE_LOCK + ! ((op & LOCK_NB) ? LOCKFILE_FAIL_IMMEDIATELY : 0), 0, low, high, &offset)) return 0; break; case LOCK_SH: /* shared */ ! if (LockFileEx(hdl, ((op & LOCK_NB) ? LOCKFILE_FAIL_IMMEDIATELY : 0), 0, low, high, &offset)) return 0; break; --- 128,142 ---- return -1; /* error in file descriptor */ /* bug for bug compatible with Unix */ UnlockFileEx(hdl, 0, low, high, &offset); ! switch (operation & ~LOCK_NB) { /* translate to LockFileEx() op */ case LOCK_EX: /* exclusive */ if (LockFileEx(hdl, LOCKFILE_EXCLUSIVE_LOCK + ! ((operation & LOCK_NB) ? LOCKFILE_FAIL_IMMEDIATELY : 0), 0, low, high, &offset)) return 0; break; case LOCK_SH: /* shared */ ! if (LockFileEx(hdl, ((operation & LOCK_NB) ? LOCKFILE_FAIL_IMMEDIATELY : 0), 0, low, high, &offset)) return 0; break; -- 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