From 92b9c6ff3ea5bdadf33feb05e06703fa35f34497 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Mon, 16 Feb 2015 12:19:46 -0800
Subject: [PATCH] POSIX says flock is in <sys/file.h>, not <unistd.h>.

Bug: 19392265
Change-Id: I14d0b56883f0354e13db04a1d140b8f60dae08d7
---
 libc/include/sys/file.h | 9 +++++++--
 libc/include/unistd.h   | 1 -
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/libc/include/sys/file.h b/libc/include/sys/file.h
index cf2f4b142..f414d34aa 100644
--- a/libc/include/sys/file.h
+++ b/libc/include/sys/file.h
@@ -25,14 +25,19 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+
 #ifndef _SYS_FILE_H_
 #define _SYS_FILE_H_
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
 
-/* ANDROID: needed for flock() */
-#include <unistd.h>
 #include <fcntl.h>
 
+__BEGIN_DECLS
+
+int flock(int, int);
+
+__END_DECLS
+
 #endif /* _SYS_FILE_H_ */
diff --git a/libc/include/unistd.h b/libc/include/unistd.h
index 6403d4ae6..16d413a8c 100644
--- a/libc/include/unistd.h
+++ b/libc/include/unistd.h
@@ -168,7 +168,6 @@ extern int dup2(int, int);
 extern int dup3(int, int, int);
 extern int fcntl(int, int, ...);
 extern int ioctl(int, int, ...);
-extern int flock(int, int);
 extern int fsync(int);
 extern int fdatasync(int);
 extern int ftruncate(int, off_t);