From e6843c3975183020cd31736ac977f8e3b2ff9425 Mon Sep 17 00:00:00 2001 From: corinna Date: Mon, 1 Dec 2003 17:27:01 +0000 Subject: [PATCH] * libc/include/sys/fcntl.h: Don't define struct flock when on Cygwin. This is done in winsup/cygwin/include/cygwin/types.h now. --- newlib/ChangeLog | 5 +++++ newlib/libc/include/sys/fcntl.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index d4c3e6faff..3a25738a10 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2003-12-01 Corinna Vinschen + + * 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 * 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 4cb12a368c..0a680a1da8 100644 --- a/newlib/libc/include/sys/fcntl.h +++ b/newlib/libc/include/sys/fcntl.h @@ -135,6 +135,7 @@ extern "C" { /*#include */ +#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 */ -- 2.11.0