make flock() a function again when it is missing

diff --git a/ext/standard/flock_compat.c b/ext/standard/flock_compat.c
index 2f03bcc85629911f58a09782fc3fbb67a889a217..92d2590662d8c4010d4c1c569d57d293cd69f92f 100644 (file)
--- 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 457e469eaaf6f4b6d51e2f237c41557a72d11911..51d186001588cab9b42d8072727150bfa53192e6 100644 (file)
--- 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