From 733309f5761d777a61b8db86e734fbffc236f104 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Mon, 9 Feb 2004 02:22:01 +0000
Subject: [PATCH] * 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__.

---
 newlib/ChangeLog                   |  7 +++++++
 newlib/libc/include/sys/features.h | 19 ++++++++++---------
 newlib/libc/include/sys/reent.h    |  2 ++
 newlib/libc/include/sys/unistd.h   |  2 ++
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 86ca74288..699312060 100644
--- 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 f69c803ff..af31ce670 100644
--- 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 e783e842e..fa19a2980 100644
--- 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 387e2ef17..6a49d5d47 100644
--- 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));