* libc/include/sys/features.h: Add appropriate defines for Cygwin pthread

support.
* libc/include/sys/signal.h: Remove unneeded __CYGWIN__ protection.
* libc/include/sys/types.h: Protect __CYGWIN__ from the rtems pthreads types.
Include <cygwin/types.h> for the cygwin specific typedefs.

3 files changed, 20 insertions, 4 deletions

diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
index f492556d1..e86ce1344 100644
--- a/newlib/libc/include/sys/features.h
+++ b/newlib/libc/include/sys/features.h
@@ -81,6 +81,11 @@ extern "C" {
 # 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
 #endif
 
 #ifdef __cplusplus
diff --git a/newlib/libc/include/sys/signal.h b/newlib/libc/include/sys/signal.h
index 53987afc3..e590ae38c 100644
--- a/newlib/libc/include/sys/signal.h
+++ b/newlib/libc/include/sys/signal.h
@@ -12,7 +12,7 @@ extern "C" {
 
 /* #ifndef __STRICT_ANSI__*/
 
-#if defined(_POSIX_THREADS) || defined(__CYGWIN__)
+#if defined(_POSIX_THREADS)
 #include <sys/types.h>   /* for pthread data types */
 #endif
 
diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h
index 7ec35ae31..e4fcef28a 100644
--- a/newlib/libc/include/sys/types.h
+++ b/newlib/libc/include/sys/types.h
@@ -206,7 +206,7 @@ typedef	struct _types_fd_set {
    condition variables, and keys.  But since RTEMS is currently the only
    newlib user of these, the ifdef is just on RTEMS. */
 
-#if defined(__rtems__)
+#if defined(__rtems__) || defined(__CYGWIN__)
 
 #ifndef __clockid_t_defined
 typedef _CLOCKID_T_ clockid_t;
@@ -220,7 +220,15 @@ typedef _TIMER_T_ timer_t;
 
 #include <sys/features.h>
 
-#if defined(_POSIX_THREADS)
+
+/* Cygwin will probably never have full posix compliance due to little things
+ * like an inability to set the stackaddress. Cygwin is also using void *  
+ * pointers rather than structs to ensure maximum binary compatability with
+ * previous releases.
+ * This means that we don't use the types defined here, but rather in
+ * <cygwin/types.h>
+ */
+#if defined(_POSIX_THREADS) && !defined(__CYGWIN__)
 
 #include <sys/sched.h>
 
@@ -313,7 +321,10 @@ typedef struct {
   int   is_initialized;  /* is this structure initialized? */
   int   init_executed;   /* has the initialization routine been run? */
 } pthread_once_t;       /* dynamic package initialization */
-
+#else
+#if defined (__CYGWIN__)
+#include <cygwin/types.h>
+#endif
 #endif /* defined(_POSIX_THREADS) */
 
 #endif  /* defined(__rtems__) */