[svn] Several Windows-related changes.

diff --git a/src/ChangeLog b/src/ChangeLog
index bafe22280f4943051b54f92744dbb39fe3756386..5f13717130f2d8456a8f1bf08d0f9128ae70ba72 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-29  Gisle Vanem  <giva@bgnett.no>
+
+       * mswindows.c: Avoid a warning if 'ws_hangup()' is unused.
+

 2006-12-27  Mauro Tortonesi  <mauro@ferrara.linux.it>
 
        * http.c (parse_content_disposition): Consider directory prefix, if
 2006-12-27  Mauro Tortonesi  <mauro@ferrara.linux.it>
 
        * http.c (parse_content_disposition): Consider directory prefix, if

diff --git a/src/mswindows.c b/src/mswindows.c
index ab31e73df62f7f677e7a0e7aa841c0b70c4031c4..64a9eb95c0ca39729bcb52909be46b56acba9924 100644 (file)
--- a/src/mswindows.c
+++ b/src/mswindows.c
@@ -90,6 +90,7 @@ ws_cleanup (void)
   WSACleanup ();
 }
 
   WSACleanup ();
 }
 

+#if defined(CTRLBREAK_BACKGND) || defined(CTRLC_BACKGND)

 static void
 ws_hangup (const char *reason)
 {
 static void
 ws_hangup (const char *reason)
 {


@@ -103,6 +104,7 @@ ws_hangup (const char *reason)
      gesture as the parent will wait for us to terminate before resuming.  */
   FreeConsole ();
 }
      gesture as the parent will wait for us to terminate before resuming.  */
   FreeConsole ();
 }

+#endif

 
 /* Construct the name for a named section (a.k.a. `file mapping') object.
    The returned string is dynamically allocated and needs to be xfree()'d.  */
 
 /* Construct the name for a named section (a.k.a. `file mapping') object.
    The returned string is dynamically allocated and needs to be xfree()'d.  */

diff --git a/windows/ChangeLog b/windows/ChangeLog
index e4dc749c644bb6b3b8f4590d4d72404f6b24205b..659a2075b985943fef4dd99dfe8b9dc70c27197f 100644 (file)
--- a/windows/ChangeLog
+++ b/windows/ChangeLog
@@ -1,3 +1,15 @@
+2006-12-29  Gisle Vanem  <giva@bgnett.no>
+
+       * config.h: Added 'HAVE_SYS_UTIME_H 1' which gets undefined as needed
+       in config-compiler.h. 
+
+       * config-compiler.h: Added '_WIN32_WINNT=0x0501' as needed to pull in
+       the prototype of getaddrinfo() and other library functions. Defined
+       HAVE_UINTPTR_T and HAVE_INTPTR_T for Digital Mars, which supports
+       'uintptr_t' and 'intptr_t'. Undefined HAVE_STDBOOL_H for Watcom, which
+       has <stdbol.h> but the file cannot be used since the '_Bool' builtin
+       is missing in the compiler!
+

 2006-10-12  Gisle Vanem  <giva@bgnett.no>
 
        * config-compiler.h (HAVE_INTPTR_T): Define to 1 under MinGW.
 2006-10-12  Gisle Vanem  <giva@bgnett.no>
 
        * config-compiler.h (HAVE_INTPTR_T): Define to 1 under MinGW.

diff --git a/windows/config-compiler.h b/windows/config-compiler.h
index a4435ef99075883ae370cf04f363a99c049a2102..033f470dd5b830ddf20bbee68e5dc2d0aa810260 100644 (file)
--- a/windows/config-compiler.h
+++ b/windows/config-compiler.h
@@ -89,8 +89,16 @@ so, delete this exception statement from your version.  */
 #define SIZEOF_LONG_LONG 8
 #define HAVE_INTPTR_T 1 
 #define HAVE_UINTPTR_T 1
 #define SIZEOF_LONG_LONG 8
 #define HAVE_INTPTR_T 1 
 #define HAVE_UINTPTR_T 1

-

 #define HAVE_STRTOLL 1
 #define HAVE_STRTOLL 1

+\f
+/* MingW needs _WIN32_WINNT==0x0501 defined to pull in getaddrinfo()
+ * and freeaddrinfo() etc.
+ */
+#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0501)
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
+

 \f
 /* -------------------- */
 /* MS Visual C section. */
 \f
 /* -------------------- */
 /* MS Visual C section. */


@@ -115,9 +123,10 @@ so, delete this exception statement from your version.  */
 #if _MSC_VER >= 1400
 #pragma warning ( disable : 4996 )
 #define _CRT_SECURE_NO_DEPRECATE
 #if _MSC_VER >= 1400
 #pragma warning ( disable : 4996 )
 #define _CRT_SECURE_NO_DEPRECATE

-#define HAVE_SYS_UTIME_H 1
-#undef HAVE_UTIME_H

 #endif
 #endif

+\f
+#undef HAVE_UTIME_H         /* no <utime.h> */
+

 \f
 /* ------------------ */
 /* Borland C section. */
 \f
 /* ------------------ */
 /* Borland C section. */


@@ -158,12 +167,16 @@ so, delete this exception statement from your version.  */
 #define HAVE_STDBOOL_H 1
 
 #define HAVE_UINT32_T 1
 #define HAVE_STDBOOL_H 1
 
 #define HAVE_UINT32_T 1

+#define HAVE_UINTPTR_T 1
+#define HAVE_INTPTR_T 1
+

 #undef SIZEOF_LONG_LONG
 #define SIZEOF_LONG_LONG 8
 #define HAVE__BOOL 1
 
 #define HAVE_USLEEP 1
 #define HAVE_STRTOLL 1
 #undef SIZEOF_LONG_LONG
 #define SIZEOF_LONG_LONG 8
 #define HAVE__BOOL 1
 
 #define HAVE_USLEEP 1
 #define HAVE_STRTOLL 1

+#undef HAVE_UTIME_H         /* no <utime.h> */

 
 \f
 /* -------------------- */
 
 \f
 /* -------------------- */


@@ -186,15 +199,25 @@ so, delete this exception statement from your version.  */
 
 #define HAVE_STDINT_H 1
 #define HAVE_INTTYPES_H 1
 
 #define HAVE_STDINT_H 1
 #define HAVE_INTTYPES_H 1

-#define HAVE_STDBOOL_H 1
+
+/* Watcom 1.6 do have <stdbool.h>, but definition of '_Bool' is missing! */
+/* #define HAVE_STDBOOL_H 1 */

 #define HAVE_STRTOLL 1
 #define HAVE_UINT32_T 1
 #define HAVE_STRTOLL 1
 #define HAVE_UINT32_T 1

-#define HAVE_SYS_UTIME_H 1

 #undef HAVE_UTIME_H
 #undef socklen_t                /* avoid clash with <ws2tcpip.h> */
 
 #undef SIZEOF_LONG_LONG
 #define SIZEOF_LONG_LONG 8
 #undef HAVE_UTIME_H
 #undef socklen_t                /* avoid clash with <ws2tcpip.h> */
 
 #undef SIZEOF_LONG_LONG
 #define SIZEOF_LONG_LONG 8

+
+/* OpenWatcom needs _WIN32_WINNT==0x0501 defined to pull in getaddrinfo()
+ * and freeaddrinfo() etc.
+ */
+#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0501)
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
+

 \f
 #else
 # error Your compiler is not supported.
 \f
 #else
 # error Your compiler is not supported.

diff --git a/windows/config.h b/windows/config.h
index b518a82ba79e1de35ef8173205d36b512475f82e..9736b1963f5fa3bc677ad243a3e535a2925f732f 100644 (file)
--- a/windows/config.h
+++ b/windows/config.h
@@ -139,6 +139,9 @@
 /* Define to 1 if you have the <utime.h> header file. */
 #define HAVE_UTIME_H 1
 
 /* Define to 1 if you have the <utime.h> header file. */
 #define HAVE_UTIME_H 1
 

+/* Define to 1 if you have the <sys/utime.h> header file. */
+#define HAVE_SYS_UTIME_H 1
+

 /* Define to 1 if you have the `vsnprintf' function. */
 #define HAVE_VSNPRINTF 1
 
 /* Define to 1 if you have the `vsnprintf' function. */
 #define HAVE_VSNPRINTF 1