From: Roland McGrath <roland@hack.frob.com>
Date: Fri, 24 Jul 2015 19:31:23 +0000 (-0700)
Subject: NaCl: Remove bogus O_SHLOCK, O_EXLOCK definitions.
X-Git-Tag: glibc-2.22~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b183b833968010a95ba41ed307dd8bea7b2e641;p=thirdparty%2Fglibc.git

NaCl: Remove bogus O_SHLOCK, O_EXLOCK definitions.
---

diff --git a/ChangeLog b/ChangeLog
index 519478df956..c11d03efb37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-24  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/nacl/bits/fcntl.h (O_SHLOCK, O_EXLOCK): Macros removed.
+
 2015-07-24  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	[BZ #18457]
diff --git a/sysdeps/nacl/bits/fcntl.h b/sysdeps/nacl/bits/fcntl.h
index ceef8dfeab5..89aab00f724 100644
--- a/sysdeps/nacl/bits/fcntl.h
+++ b/sysdeps/nacl/bits/fcntl.h
@@ -35,10 +35,6 @@
 #define O_ASYNC         020000  /* Send SIGIO to owner when data is ready.  */
 #define O_FSYNC         010000  /* Synchronous writes.  */
 #define O_SYNC          O_FSYNC
-#ifdef  __USE_MISC
-# define O_SHLOCK       XXX     /* Open with shared file lock.  */
-# define O_EXLOCK       XXX     /* Open with shared exclusive lock.  */
-#endif
 #ifdef __USE_XOPEN2K8
 # define O_DIRECTORY    00200000        /* Must be a directory.  */
 # define O_NOFOLLOW     00400000        /* Do not follow links.  */