Re: cvs: php4 /ext/standard flock_compat.c flock_compat.h

At 11:40 PM 11/11/2002 +0000, Marcus Boerger wrote:

helly           Mon Nov 11 18:40:33 2002 EDT

Modified files:

    /php4/ext/standard  flock_compat.c flock_compat.h

Log: make flock() a function again when it is missing Index: php4/ext/standard/flock_compat.c diff -u php4/ext/standard/flock_compat.c:1.19 php4/ext/standard/flock_compat.c:1.20

--- php4/ext/standard/flock_compat.c:1.19       Mon Nov 11 15:52:09 2002
+++ php4/ext/standard/flock_compat.c    Mon Nov 11 18:40:33 2002

@@ -16,7 +16,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: flock_compat.c,v 1.19 2002/11/11 20:52:09 helly Exp $ */ +/* $Id: flock_compat.c,v 1.20 2002/11/11 23:40:33 helly Exp $ */ #include <php.h> #include <errno.h> @@ -41,7 +41,10 @@ #endif #ifndef HAVE_FLOCK -/* defines flock as php_flock */ +PHPAPI int php_flock(int fd, int operation) +{

+       return php_flock(fd, operation);

+} #endif /* !defined(HAVE_FLOCK) */

This looks kind of recurisve to me. Andi

PHPAPI int php_flock(int fd, int operation) Index: php4/ext/standard/flock_compat.h diff -u php4/ext/standard/flock_compat.h:1.15 php4/ext/standard/flock_compat.h:1.16

--- php4/ext/standard/flock_compat.h:1.15       Mon Nov 11 15:52:09 2002
+++ php4/ext/standard/flock_compat.h    Mon Nov 11 18:40:33 2002

@@ -16,7 +16,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: flock_compat.h,v 1.15 2002/11/11 20:52:09 helly Exp $ */ +/* $Id: flock_compat.h,v 1.16 2002/11/11 23:40:33 helly Exp $ */ #ifndef FLOCK_COMPAT_H #define FLOCK_COMPAT_H @@ -32,7 +32,7 @@

 #      define LOCK_EX 2
 #      define LOCK_NB 4
 #      define LOCK_UN 8

-# define flock php_flock +PHPAPI int flock(int fd, int operation); #endif #ifdef PHP_WIN32 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php