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'.
This commit is contained in:
Gisle Vanem 2008-12-16 08:48:44 +00:00
parent 418683f537
commit 2025193b7a
2 changed files with 30 additions and 4 deletions

View File

@ -200,6 +200,30 @@
/* Define this if you have struct timeval */ /* Define this if you have struct timeval */
#define HAVE_STRUCT_TIMEVAL 1 #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 */ /* COMPILER SPECIFIC */
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */

View File

@ -153,6 +153,7 @@
#endif #endif
#ifdef MSDOS #ifdef MSDOS
#define USE_WATT32
#include <dos.h> #include <dos.h>
static const char *msdosify(const char *); static const char *msdosify(const char *);
@ -621,6 +622,7 @@ static CURLcode main_init(void)
/* stop stat() wasting time */ /* stop stat() wasting time */
_djstat_flags |= _STAT_INODE | _STAT_EXEC_MAGIC | _STAT_DIRSIZE; _djstat_flags |= _STAT_INODE | _STAT_EXEC_MAGIC | _STAT_DIRSIZE;
#endif #endif
return curl_global_init(CURL_GLOBAL_DEFAULT); return curl_global_init(CURL_GLOBAL_DEFAULT);
} }
@ -831,8 +833,8 @@ static void help(void)
" -v/--verbose Make the operation more talkative", " -v/--verbose Make the operation more talkative",
" -V/--version Show version number and quit", " -V/--version Show version number and quit",
#ifdef MSDOS #ifdef USE_WATT32
" --wdebug Turn on Watt-32 debugging under DJGPP", " --wdebug Turn on Watt-32 debugging",
#endif #endif
" -w/--write-out <format> What to output after completion", " -w/--write-out <format> What to output after completion",
" -q If used as the first parameter disables .curlrc", " -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}, {"*m", "ntlm", FALSE},
{"*n", "basic", FALSE}, {"*n", "basic", FALSE},
{"*o", "anyauth", FALSE}, {"*o", "anyauth", FALSE},
#ifdef MSDOS #ifdef USE_WATT32
{"*p", "wdebug", FALSE}, {"*p", "wdebug", FALSE},
#endif #endif
{"*q", "ftp-create-dirs", FALSE}, {"*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 */ /* --no-anyauth simply doesn't touch it */
break; break;
#ifdef MSDOS #ifdef USE_WATT32
case 'p': /* --wdebug */ case 'p': /* --wdebug */
dbug_init(); dbug_init();
break; break;