Fix flock_compat layer

Author: Girgias

ext/spl/spl_directory.c

@@ -2493,13 +2493,6 @@ PHP_METHOD(SplFileObject, getCsvControl)
 }
 /* }}} */
 
-/* Because apparently it doesn't want to pull them from flock_compat.h for some stupid reason */
-#define LOCK_SH 1
-#define LOCK_EX 2
-#define LOCK_NB 4
-#define LOCK_UN 8
-
-
 static int flock_values[] = { LOCK_SH, LOCK_EX, LOCK_UN };
 
 /* {{{ Portable file locking, copy pasted from ext/standard/file.c flock() function.

ext/standard/flock_compat.c

@@ -18,17 +18,6 @@
 #include <errno.h>
 #include "ext/standard/flock_compat.h"
 
-#if HAVE_STRUCT_FLOCK
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/file.h>
-#endif
-
-#ifdef PHP_WIN32
-#include <io.h>
-#include "config.w32.h"
-#endif
-
 #ifndef HAVE_FLOCK
 PHPAPI int flock(int fd, int operation)
 {

ext/standard/flock_compat.h

@@ -17,6 +17,17 @@
 #ifndef FLOCK_COMPAT_H
 #define FLOCK_COMPAT_H
 
+#if HAVE_STRUCT_FLOCK
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/file.h>
+#endif
+
+#ifdef PHP_WIN32
+#include <io.h>
+#include "config.w32.h"
+#endif
+
 /* php_flock internally uses fcntl whether or not flock is available
  * This way our php_flock even works on NFS files.
  * More info: /usr/src/linux/Documentation