From: Marcus Boerger <helly@php.net>
Date: Mon, 11 Nov 2002 23:40:33 +0000 (+0000)
Subject: make flock() a function again when it is missing
X-Git-Tag: php-4.3.0RC1~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8696890cac133a26d696e753acadfa0f31cd067;p=php

make flock() a function again when it is missing
---

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