From b6e6fbbb3d2750448c165f23b8fca3669c9b9b7f Mon Sep 17 00:00:00 2001
From: cgf <cgf>
Date: Fri, 18 Nov 2005 15:45:54 +0000
Subject: [PATCH] * include/time.h: Move cygwin declarations to cygwin-specific
 header. * include/sys/time.h: Rename cygwin include to "sys_time.h".

---
 newlib/ChangeLog               |  5 +++++
 newlib/libc/include/sys/time.h |  2 +-
 newlib/libc/include/time.h     | 14 ++++----------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 9bf48c25c8..e2993e2bb1 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-18  Christopher Faylor  <cgf@timesys.com>
+
+	* include/time.h: Move cygwin declarations to cygwin-specific header.
+	* include/sys/time.h: Rename cygwin include to "sys_time.h".
+
 2005-11-17  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* libc/sys/linux/dl/dl-local.h: New file based on old dlfcn.h
diff --git a/newlib/libc/include/sys/time.h b/newlib/libc/include/sys/time.h
index eee5ca7276..ffee50f6ad 100644
--- a/newlib/libc/include/sys/time.h
+++ b/newlib/libc/include/sys/time.h
@@ -24,7 +24,7 @@ struct timezone {
 };
 
 #ifdef __CYGWIN__
-#include <cygwin/time.h>
+#include <cygwin/sys_time.h>
 #endif /* __CYGWIN__ */
 
 #endif /* _WINSOCK_H */
diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h
index 0ef5e958ea..60603e198b 100644
--- a/newlib/libc/include/time.h
+++ b/newlib/libc/include/time.h
@@ -145,6 +145,10 @@ char *_EXFUN(timezone, (void));
 
 #include <sys/features.h>
 
+#ifdef __CYGWIN__
+#include <cygwin/time.h>
+#endif /*__CYGWIN__*/
+
 #if defined(_POSIX_TIMERS)
 
 #include <signal.h>
@@ -183,16 +187,6 @@ int _EXFUN(nanosleep, (const struct timespec  *rqtp, struct timespec *rmtp));
 #ifdef __cplusplus
 }
 #endif
-#else
-#ifdef __CYGWIN__
-#ifdef __cplusplus
-extern "C" {
-#endif
-int _EXFUN(nanosleep, (const struct timespec  *rqtp, struct timespec *rmtp));
-#ifdef __cplusplus
-}
-#endif
-#endif /* __CYGWIN__ */
 #endif /* _POSIX_TIMERS */
 
 #ifdef __cplusplus
-- 
2.11.0