* libc/include/grp.h: Include Cygwin specific header.

	* libc/include/sys/stat.h: Ditto.  Don't define `struct stat'
	when compiling for Cygwin.
	* libc/include/sys/types.h: Don't define off_t, uid_t
	and gid_t when compiling for Cygwin.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 3630b1d408738ec0ab911247bfcf485ab44c24cd..6ba325412450e809e2e01610bd5aba3b608e3fed 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,11 @@
+2002-02-09  Corinna Vinschen  <corinna@vinschen.de>
+
+       * libc/include/grp.h: Include Cygwin specific header.
+       * libc/include/sys/stat.h: Ditto.  Don't define `struct stat'
+       when compiling for Cygwin.
+       * libc/include/sys/types.h: Don't define off_t, uid_t
+       and gid_t when compiling for Cygwin.
+
 2002-02-08  matthew green  <mrg@redhat.com>
 
        * libc/include/sys/reent.h (_REENT_CHECK_EMERGENCY): Allocate

diff --git a/newlib/libc/include/grp.h b/newlib/libc/include/grp.h
index 2e676f36664ab998b4bd5ac5b2d4eaa098abad55..e652b29f243af868582351afee34effe2bed305a 100644 (file)
--- a/newlib/libc/include/grp.h
+++ b/newlib/libc/include/grp.h
@@ -44,6 +44,9 @@
 #define        _GRP_H_
 
 #include <sys/types.h>
+#ifdef __CYGWIN__
+#include <cygwin/grp.h>
+#endif
 
 #if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
 #define        _PATH_GROUP             "/etc/group"
@@ -56,7 +59,6 @@ struct group {
        char    **gr_mem;               /* group members */
 };
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
index bca437707c5004d0370db51418a65d5d5c93aaee..3ef2291c8a352c2fe158bf2d6b65f602db517314 100644 (file)
--- a/newlib/libc/include/sys/stat.h
+++ b/newlib/libc/include/sys/stat.h
@@ -22,6 +22,9 @@ extern "C" {
    sizes of any of the basic types change (short, int, long) [via a compile
    time option].  */
 
+#ifdef __CYGWIN__
+#include <cygwin/stat.h>
+#else
 struct stat 
 {
   dev_t                st_dev;
@@ -49,6 +52,7 @@ struct        stat
   long st_spare4[2];
 #endif
 };
+#endif
 
 #define        _IFMT           0170000 /* type of file */
 #define                _IFDIR  0040000 /* directory */

diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h
index 96d25c4a04170d9159f5db31e8f610f062308d2a..2a12e4e3404df8d4414bf61018ac326a1bb8f170 100644 (file)
--- a/newlib/libc/include/sys/types.h
+++ b/newlib/libc/include/sys/types.h
@@ -128,10 +128,13 @@ typedef unsigned long long dev_t;
 typedef        short   dev_t;
 #endif
 
-typedef        long    off_t;
+#ifndef __CYGWIN__     /* which defines these types in it's own types.h. */
+typedef long           off_t;
 
 typedef        unsigned short  uid_t;
 typedef        unsigned short  gid_t;
+#endif
+
 typedef int pid_t;
 typedef        long key_t;
 typedef long ssize_t;