* libc/include/sys/fcntl.h: Don't define struct flock when on

	Cygwin.  This is done in winsup/cygwin/include/cygwin/types.h now.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index d4c3e6faff4cd8378495e33c3853c9309bc43978..3a25738a10cf7c9c0c0d9f3e13009654b5e4cee8 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-01  Corinna Vinschen  <corinna@vinschen.de>
+
+       * libc/include/sys/fcntl.h: Don't define struct flock when on
+       Cygwin.  This is done in winsup/cygwin/include/cygwin/types.h now.
+
 2003-11-28  Christopher Faylor  <cgf@redhat.com>
 
        * libc/include/sys/signal.h: Use system specific signal file when

diff --git a/newlib/libc/include/sys/fcntl.h b/newlib/libc/include/sys/fcntl.h
index 4cb12a368cdc6db9bf6f11eccfdd10e2d0952003..0a680a1da89b29aa563c1ea627998b8ba11a5b98 100644 (file)
--- a/newlib/libc/include/sys/fcntl.h
+++ b/newlib/libc/include/sys/fcntl.h
@@ -135,6 +135,7 @@ extern "C" {
 
 /*#include <sys/stdtypes.h>*/
 
+#ifndef __CYGWIN__
 /* file segment locking set data type - information passed to system by user */
 struct flock {
        short   l_type;         /* F_RDLCK, F_WRLCK, or F_UNLCK */
@@ -144,6 +145,7 @@ struct flock {
        short   l_pid;          /* returned with F_GETLK */
        short   l_xxx;          /* reserved for future use */
 };
+#endif /* __CYGWIN__ */
 
 #ifndef        _POSIX_SOURCE
 /* extended file segment locking set data type */