diff options
author | Timo Schulz <[email protected]> | 2003-09-21 17:36:51 +0000 |
---|---|---|
committer | Timo Schulz <[email protected]> | 2003-09-21 17:36:51 +0000 |
commit | 046493fce9825d3698f6750a8e9b94777d1f265e (patch) | |
tree | 91234cbef0cabaf1b59a3bef365909d29855e79e | |
parent | * g10.c (main): Trim --help to commonly used options. Remove -f. (diff) | |
download | gnupg-046493fce9825d3698f6750a8e9b94777d1f265e.tar.gz gnupg-046493fce9825d3698f6750a8e9b94777d1f265e.zip |
2003-09-21 Timo Schulz <[email protected]>
* http.c [WIN32]: Define MB_CUR_MAX.
(connect_server): use unsigned long since W32 does not have in_addr_t.
Diffstat (limited to '')
-rw-r--r-- | util/ChangeLog | 5 | ||||
-rw-r--r-- | util/http.c | 3 | ||||
-rw-r--r-- | util/regcomp.c | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 0b14f2071..4db04dd1b 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,8 @@ +2003-09-21 Timo Schulz <[email protected]> + + * http.c [WIN32]: Define MB_CUR_MAX. + (connect_server): use unsigned long since W32 does not have in_addr_t. + 2003-08-28 David Shaw <[email protected]> * dotlock.c, http.c, iobuf.c, simple-gettext.c, srv.c, srv.h, diff --git a/util/http.c b/util/http.c index 2417f30b0..28faf455e 100644 --- a/util/http.c +++ b/util/http.c @@ -714,8 +714,7 @@ connect_server( const char *server, ushort port, unsigned int flags ) struct srventry *srvlist=NULL; #ifdef _WIN32 - in_addr_t inaddr; -#warning check the windoze type + unsigned long inaddr; init_sockets(); /* Win32 gethostbyname doesn't handle IP addresses internally, so we diff --git a/util/regcomp.c b/util/regcomp.c index 13cce2573..c517b71cc 100644 --- a/util/regcomp.c +++ b/util/regcomp.c @@ -26,6 +26,10 @@ #include <stdlib.h> #include <string.h> +#ifdef _WIN32 +#define MB_CUR_MAX 2 +#endif + #if defined HAVE_WCHAR_H || defined _LIBC # include <wchar.h> #endif /* HAVE_WCHAR_H || _LIBC */ |