diff options
| author | Gisle Vanem <gvanem@broadpark.no> | 2008-12-16 08:48:44 +0000 |
|---|---|---|
| committer | Gisle Vanem <gvanem@broadpark.no> | 2008-12-16 08:48:44 +0000 |
| commit | 2025193b7a12ee1c94f103f5cd6e89281feb44d8 (patch) | |
| tree | 174e5c8a82716aae77d705bcfe1217862c41b374 /src | |
| parent | 418683f5377d7bcb751888345ba14a77fd68cdbd (diff) | |
Added the use of Watt-32 tcp/ip stack for Win32 targets.
Added USE_WATT32 unconditionally for MSDOS targets since
it's the only option. Adjusted the text for '--wdebug'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/config-win32.h | 24 | ||||
| -rw-r--r-- | src/main.c | 10 |
2 files changed, 30 insertions, 4 deletions
diff --git a/src/config-win32.h b/src/config-win32.h index 337d4e798..0ca61cccf 100644 --- a/src/config-win32.h +++ b/src/config-win32.h @@ -201,6 +201,30 @@ #define HAVE_STRUCT_TIMEVAL 1 /* ---------------------------------------------------------------- */ +/* Watt-32 tcp/ip SPECIFIC */ +/* ---------------------------------------------------------------- */ + +#ifdef USE_WATT32 + #include <tcp.h> + #undef byte + #undef word + #undef USE_WINSOCK + #undef HAVE_WINSOCK_H + #undef HAVE_WINSOCK2_H + #undef HAVE_WS2TCPIP_H + #define HAVE_GETADDRINFO + #define HAVE_GETNAMEINFO + #define HAVE_SYS_IOCTL_H + #define HAVE_SYS_SOCKET_H + #define HAVE_NETINET_IN_H + #define HAVE_NETDB_H + #define HAVE_ARPA_INET_H + #define HAVE_FREEADDRINFO + #define SOCKET int +#endif + + +/* ---------------------------------------------------------------- */ /* COMPILER SPECIFIC */ /* ---------------------------------------------------------------- */ diff --git a/src/main.c b/src/main.c index f325106ec..de7852168 100644 --- a/src/main.c +++ b/src/main.c @@ -153,6 +153,7 @@ #endif #ifdef MSDOS +#define USE_WATT32 #include <dos.h> static const char *msdosify(const char *); @@ -621,6 +622,7 @@ static CURLcode main_init(void) /* stop stat() wasting time */ _djstat_flags |= _STAT_INODE | _STAT_EXEC_MAGIC | _STAT_DIRSIZE; #endif + return curl_global_init(CURL_GLOBAL_DEFAULT); } @@ -831,8 +833,8 @@ static void help(void) " -v/--verbose Make the operation more talkative", " -V/--version Show version number and quit", -#ifdef MSDOS - " --wdebug Turn on Watt-32 debugging under DJGPP", +#ifdef USE_WATT32 + " --wdebug Turn on Watt-32 debugging", #endif " -w/--write-out <format> What to output after completion", " -q If used as the first parameter disables .curlrc", @@ -1620,7 +1622,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */ {"*m", "ntlm", FALSE}, {"*n", "basic", FALSE}, {"*o", "anyauth", FALSE}, -#ifdef MSDOS +#ifdef USE_WATT32 {"*p", "wdebug", FALSE}, #endif {"*q", "ftp-create-dirs", FALSE}, @@ -1955,7 +1957,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */ /* --no-anyauth simply doesn't touch it */ break; -#ifdef MSDOS +#ifdef USE_WATT32 case 'p': /* --wdebug */ dbug_init(); break; |