* pthread.h (winsock.h): Include unconditionally.

        (ETIMEDOUT): Change fallback value to that defined by winsock.h.

2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index dbed53e..c4dff53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-11-05  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 
+	* pthread.h (winsock.h): Include unconditionally.
+	(ETIMEDOUT): Change fallback value to that defined by winsock.h.
+	
 	* general: Patched for portability to WinCE. The details are
 	described in the file WinCE-PORT. Follow the instructions
 	in README.WinCE to make the appropriate changes in config.h.
diff --git a/pthread.h b/pthread.h
index 54d00ba..c8076be 100644
--- a/pthread.h
+++ b/pthread.h
@@ -250,11 +250,9 @@ struct timespec {
 #include <process.h>
 
 /*
- * note: ETIMEDOUT is correctly defined in winsock.h on winCE
+ * note: ETIMEDOUT is correctly defined in winsock.h
  */
-#ifdef HAVE_WINSOCK_H
 #include <winsock.h>
-#endif
 
 #ifdef NEED_ERRNO
 #include "need_errno.h"
@@ -262,8 +260,11 @@ struct timespec {
 #include <errno.h>
 #endif
 
+/*
+ * In case ETIMEDOUT hasn't been defined above somehow.
+ */
 #ifndef ETIMEDOUT
-#define ETIMEDOUT 19981220     /* FIXME: Need the proper value here. */
+#define ETIMEDOUT 10060     /* This is the value in winsock.h. */
 #endif
 
 #ifdef _MSC_VER