--- Git-latest\lib\config-dos.h	Thu Feb 14 16:46:14 2013
+++ lib\config-dos.h	Thu Feb 14 18:24:56 2013
@@ -79,7 +79,6 @@
 #define HAVE_SYS_SOCKET_H      1
 #define HAVE_SYS_STAT_H        1
 #define HAVE_SYS_TYPES_H       1
-#define HAVE_TERMIOS_H         1
 #define HAVE_TIME_H            1
 #define HAVE_UNISTD_H          1

@@ -149,7 +148,7 @@

 #if defined(__HIGHC__) || \
     (defined(__GNUC__) && (__GNUC__ < 4))
-#define ssize_t    int
+  #define ssize_t  int
 #endif

 #define CURL_CA_BUNDLE  getenv("CURL_CA_BUNDLE")
@@ -162,6 +161,7 @@
   #define HAVE_SIGACTION  1
   #define HAVE_SIGSETJMP  1
   #define HAVE_SYS_TIME_H 1
+  #define HAVE_TERMIOS_H  1
   #define HAVE_VARIADIC_MACROS_GCC 1

   /* Because djgpp <= 2.03 doesn't have snprintf() etc. */
@@ -174,11 +174,7 @@

 #elif defined(__HIGHC__)
   #define HAVE_SYS_TIME_H 1
-#endif
-
-#ifdef MSDOS  /* Watt-32 */
-  #define HAVE_CLOSESOCKET_CAMEL  1
-  #define CloseSocket(s)          close_s((s))
+  #define strerror(e) strerror_s_(e)
 #endif

 #undef word
--- Git-latest\lib\curl_setup_once.h	Thu Feb 07 12:33:48 2013
+++ lib\curl_setup_once.h	Thu Feb 14 18:17:27 2013
@@ -255,6 +255,8 @@

 #if defined(HAVE_CLOSESOCKET)
 #  define sclose(x)  closesocket((x))
+#elif defined(MSDOS) || defined(USE_WATT32)
+#  define sclose(x)   close_s((x))
 #elif defined(HAVE_CLOSESOCKET_CAMEL)
 #  define sclose(x)  CloseSocket((x))