From 2a662f7870246e0cd06bb220a435fd8d8e0388cb Mon Sep 17 00:00:00 2001 From: David Shaw Date: Thu, 3 Nov 2005 04:46:20 +0000 Subject: [PATCH] Fix various build warnings reported by Joe Vender on MinGW. --- ChangeLog | 4 ++++ configure.ac | 1 + keyserver/ChangeLog | 5 +++++ keyserver/gpgkeys_hkp.c | 2 +- util/ChangeLog | 5 +++++ util/secmem.c | 6 ++++++ 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0cdcb885f..dc34374ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-11-02 David Shaw + + * configure.ac: Check for a getpagesize() declaration. + 2005-10-14 David Shaw * NEWS: Clarify the cURL keyserver changes, and add a note about diff --git a/configure.ac b/configure.ac index d04ddf677..761132bb2 100644 --- a/configure.ac +++ b/configure.ac @@ -813,6 +813,7 @@ else fi dnl Checks for library functions. +AC_CHECK_DECLS(getpagesize) AC_FUNC_FSEEKO AC_FUNC_VPRINTF AC_FUNC_FORK diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 462d3b666..f0a58149a 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,8 @@ +2005-11-02 David Shaw + + * gpgkeys_hkp.c (search_key): Fix warning with typecast (though + curl should really have defined that char * as const). + 2005-08-25 David Shaw * ksutil.h, ksutil.c (parse_ks_options): Remove exact-name and diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c index dc05a619e..38e9cefde 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.c @@ -298,7 +298,7 @@ search_key(const char *searchkey) fprintf(console,"gpgkeys: search type is %d, and key is \"%s\"\n", search_type,searchkey); - searchkey_encoded=curl_escape(searchkey,0); + searchkey_encoded=curl_escape((char *)searchkey,0); if(!searchkey_encoded) { fprintf(console,"gpgkeys: out of memory\n"); diff --git a/util/ChangeLog b/util/ChangeLog index e4e8a83f0..ff451b26d 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,8 @@ +2005-11-02 David Shaw + + * util.c [!HAVE_DECL_GETPAGESIZE]: Prototype getpagesize() if + unistd.h doesn't have it (for MinGW). + 2005-09-22 Werner Koch * iobuf.c (iobuf_get_filelength): New arg OVERFLOW. diff --git a/util/secmem.c b/util/secmem.c index 8ab33e1d1..a3ab60155 100644 --- a/util/secmem.c +++ b/util/secmem.c @@ -43,6 +43,12 @@ #include "util.h" #include "i18n.h" +/* MinGW doesn't seem to prototype getpagesize, though it does have + it. */ +#if !HAVE_DECL_GETPAGESIZE +int getpagesize(void); +#endif + #if defined(MAP_ANON) && !defined(MAP_ANONYMOUS) #define MAP_ANONYMOUS MAP_ANON #endif