diff options
| author | Marcus Boerger <helly@php.net> | 2002-11-11 20:52:09 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2002-11-11 20:52:09 +0000 |
| commit | 1554bb6db6897325f99245d04bb5d6848b862f44 (patch) | |
| tree | 45c110e147174c2ba8725e3e6e8b2eb18eae29fb /ext/standard/flock_compat.c | |
| parent | 1cee814da0aab8c0140d7ff098938cb6e738a235 (diff) | |
| download | php-git-1554bb6db6897325f99245d04bb5d6848b862f44.tar.gz | |
-make the flock() emulation a separate function named php_flock()
-use a define to make php_flock() available as flock() when necessary
# The emulated php_flock even works on NFS this will be used elsewhere.
Diffstat (limited to 'ext/standard/flock_compat.c')
| -rw-r--r-- | ext/standard/flock_compat.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/standard/flock_compat.c b/ext/standard/flock_compat.c index 44f0b5c6ac..2f03bcc856 100644 --- a/ext/standard/flock_compat.c +++ b/ext/standard/flock_compat.c @@ -41,7 +41,10 @@ #endif #ifndef HAVE_FLOCK -PHPAPI int flock(int fd, int operation) +/* defines flock as php_flock */ +#endif /* !defined(HAVE_FLOCK) */ + +PHPAPI int php_flock(int fd, int operation) #if HAVE_STRUCT_FLOCK { struct flock flck; @@ -157,7 +160,6 @@ PHPAPI int flock(int fd, int operation) return 0; } #endif -#endif /* !defined(HAVE_FLOCK) */ #if !(HAVE_INET_ATON) /* {{{ inet_aton |