* libc/include/sys/features.h: Add _POSIX_TIMERS define for __CYGWIN__.

* libc/include/sys/reent.h (__getreent): Protect against possibly being
defined.
* libc/include/sys/unistd.h (fdatasync): Don't define for __CYGWIN__.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 86ca742..6993120 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-08  Christopher Faylor  <cgf@redhat.com>
+
+       * libc/include/sys/features.h: Add _POSIX_TIMERS define for __CYGWIN__.
+       * libc/include/sys/reent.h (__getreent): Protect against possibly being
+       defined.
+       * libc/include/sys/unistd.h (fdatasync): Don't define for __CYGWIN__.
+
 2004-02-05  Paul Brook  <paul@codesourcery.com>
 
        * libc/include/machine/ieeefp.h[__arm__][__VFP_FP__]: Set 

diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
index f69c803..af31ce6 100644 (file)
--- a/newlib/libc/include/sys/features.h
+++ b/newlib/libc/include/sys/features.h
@@ -78,15 +78,16 @@ extern "C" {
 #endif
 
 #ifdef __CYGWIN__
-# define _POSIX_JOB_CONTROL    1
-# define _POSIX_SAVED_IDS      0
-# define _POSIX_VERSION                199009L
-# define _POSIX_THREADS                          1
-# define _POSIX_THREAD_PROCESS_SHARED            1
-# define _POSIX_THREAD_SAFE_FUNCTIONS            1
-# define _POSIX_THREAD_PRIORITY_SCHEDULING       1
-# define _POSIX_THREAD_ATTR_STACKSIZE            1
-# define _POSIX_SEMAPHORES                       1
+# define _POSIX_JOB_CONTROL                    1
+# define _POSIX_SAVED_IDS                      0
+# define _POSIX_VERSION                                199009L
+# define _POSIX_THREADS                         1
+# define _POSIX_THREAD_PROCESS_SHARED           1
+# define _POSIX_THREAD_SAFE_FUNCTIONS           1
+# define _POSIX_THREAD_PRIORITY_SCHEDULING      1
+# define _POSIX_THREAD_ATTR_STACKSIZE           1
+# define _POSIX_SEMAPHORES                      1
+# define _POSIX_TIMERS                         1
 #endif
 
 #ifdef __cplusplus

diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index e783e84..fa19a29 100644 (file)
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -736,7 +736,9 @@ void _reclaim_reent _PARAMS ((struct _reent *));
 #ifndef _REENT_ONLY
 
 #if defined(__DYNAMIC_REENT__) && !defined(__SINGLE_THREAD__)
+#ifndef __getreent
   struct _reent * _EXFUN(__getreent, (void));
+#endif
 # define _REENT (__getreent())
 #else /* __SINGLE_THREAD__ || !__DYNAMIC_REENT__ */
 # define _REENT _impure_ptr

diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h
index 387e2ef..6a49d5d 100644 (file)
--- a/newlib/libc/include/sys/unistd.h
+++ b/newlib/libc/include/sys/unistd.h
@@ -53,7 +53,9 @@ int     _EXFUN(fchown, (int __fildes, uid_t __owner, gid_t __group ));
 pid_t   _EXFUN(fork, (void ));
 long    _EXFUN(fpathconf, (int __fd, int __name ));
 int     _EXFUN(fsync, (int __fd));
+#ifndef __CYGWIN__
 int     _EXFUN(fdatasync, (int __fd));
+#endif
 char    _EXFUN(*getcwd, (char *__buf, size_t __size ));
 #if defined(__CYGWIN__)
 int    _EXFUN(getdomainname ,(char *__name, size_t __len));