diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2003-12-01 20:27:01 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2003-12-01 20:27:01 +0300 |
| commit | 18dcb167578ef69fa8965fba0c286198bdf3e6da (patch) | |
| tree | 81898c4f1b0b83d77fca21ae3f94fefcd0ba703a /newlib | |
| parent | dc3998682acd295299bffc3c544af74503e1dc02 (diff) | |
* libc/include/sys/fcntl.h: Don't define struct flock when on
Cygwin. This is done in winsup/cygwin/include/cygwin/types.h now.
Diffstat (limited to 'newlib')
| -rw-r--r-- | newlib/ChangeLog | 5 | ||||
| -rw-r--r-- | newlib/libc/include/sys/fcntl.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index d4c3e6faf..3a25738a1 100644 --- 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 4cb12a368..0a680a1da 100644 --- 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 */ |