1
0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00

[svn] Several Windows-related changes.

This commit is contained in:
mtortonesi 2006-12-29 09:23:20 -08:00
parent 14ee3a6c03
commit 336c0de301
5 changed files with 49 additions and 5 deletions

View File

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

View File

@ -90,6 +90,7 @@ ws_cleanup (void)
WSACleanup (); WSACleanup ();
} }
#if defined(CTRLBREAK_BACKGND) || defined(CTRLC_BACKGND)
static void static void
ws_hangup (const char *reason) 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. */ gesture as the parent will wait for us to terminate before resuming. */
FreeConsole (); FreeConsole ();
} }
#endif
/* Construct the name for a named section (a.k.a. `file mapping') object. /* 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. */ The returned string is dynamically allocated and needs to be xfree()'d. */

View File

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

View File

@ -89,8 +89,16 @@ so, delete this exception statement from your version. */
#define SIZEOF_LONG_LONG 8 #define SIZEOF_LONG_LONG 8
#define HAVE_INTPTR_T 1 #define HAVE_INTPTR_T 1
#define HAVE_UINTPTR_T 1 #define HAVE_UINTPTR_T 1
#define HAVE_STRTOLL 1 #define HAVE_STRTOLL 1
/* 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
/* -------------------- */ /* -------------------- */
/* MS Visual C section. */ /* MS Visual C section. */
@ -115,9 +123,10 @@ so, delete this exception statement from your version. */
#if _MSC_VER >= 1400 #if _MSC_VER >= 1400
#pragma warning ( disable : 4996 ) #pragma warning ( disable : 4996 )
#define _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE
#define HAVE_SYS_UTIME_H 1
#undef HAVE_UTIME_H
#endif #endif
#undef HAVE_UTIME_H /* no <utime.h> */
/* ------------------ */ /* ------------------ */
/* Borland C section. */ /* Borland C section. */
@ -158,12 +167,16 @@ so, delete this exception statement from your version. */
#define HAVE_STDBOOL_H 1 #define HAVE_STDBOOL_H 1
#define HAVE_UINT32_T 1 #define HAVE_UINT32_T 1
#define HAVE_UINTPTR_T 1
#define HAVE_INTPTR_T 1
#undef SIZEOF_LONG_LONG #undef SIZEOF_LONG_LONG
#define SIZEOF_LONG_LONG 8 #define SIZEOF_LONG_LONG 8
#define HAVE__BOOL 1 #define HAVE__BOOL 1
#define HAVE_USLEEP 1 #define HAVE_USLEEP 1
#define HAVE_STRTOLL 1 #define HAVE_STRTOLL 1
#undef HAVE_UTIME_H /* no <utime.h> */
/* -------------------- */ /* -------------------- */
@ -186,15 +199,25 @@ so, delete this exception statement from your version. */
#define HAVE_STDINT_H 1 #define HAVE_STDINT_H 1
#define HAVE_INTTYPES_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_STRTOLL 1
#define HAVE_UINT32_T 1 #define HAVE_UINT32_T 1
#define HAVE_SYS_UTIME_H 1
#undef HAVE_UTIME_H #undef HAVE_UTIME_H
#undef socklen_t /* avoid clash with <ws2tcpip.h> */ #undef socklen_t /* avoid clash with <ws2tcpip.h> */
#undef SIZEOF_LONG_LONG #undef SIZEOF_LONG_LONG
#define SIZEOF_LONG_LONG 8 #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
#else #else
# error Your compiler is not supported. # error Your compiler is not supported.

View File

@ -139,6 +139,9 @@
/* Define to 1 if you have the <utime.h> header file. */ /* Define to 1 if you have the <utime.h> header file. */
#define HAVE_UTIME_H 1 #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 to 1 if you have the `vsnprintf' function. */
#define HAVE_VSNPRINTF 1 #define HAVE_VSNPRINTF 1