summaryrefslogtreecommitdiff
path: root/ext/standard
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2002-11-11 23:40:33 +0000
committerMarcus Boerger <helly@php.net>2002-11-11 23:40:33 +0000
commitb8696890cac133a26d696e753acadfa0f31cd067 (patch)
tree4e7ddbff26d6eeb2c66e7f16ae8ff846b33d77d0 /ext/standard
parent6a14b16e3411c5edd865fbcc550e2e129e7714db (diff)
downloadphp-git-b8696890cac133a26d696e753acadfa0f31cd067.tar.gz
make flock() a function again when it is missing
Diffstat (limited to 'ext/standard')
-rw-r--r--ext/standard/flock_compat.c5
-rw-r--r--ext/standard/flock_compat.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/ext/standard/flock_compat.c b/ext/standard/flock_compat.c
index 2f03bcc856..92d2590662 100644
--- a/ext/standard/flock_compat.c
+++ b/ext/standard/flock_compat.c
@@ -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) */
PHPAPI int php_flock(int fd, int operation)
diff --git a/ext/standard/flock_compat.h b/ext/standard/flock_compat.h
index 457e469eaa..51d1860015 100644
--- a/ext/standard/flock_compat.h
+++ b/ext/standard/flock_compat.h
@@ -32,7 +32,7 @@ PHPAPI int php_flock(int fd, int operation);
# 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