diff options
| -rw-r--r-- | keyserver/ChangeLog | 5 | ||||
| -rw-r--r-- | keyserver/curl-shim.h | 4 | ||||
| -rw-r--r-- | keyserver/gpgkeys_curl.c | 4 | ||||
| -rw-r--r-- | keyserver/gpgkeys_hkp.c | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 169ce77e4..edb3ce884 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,8 @@ +2008-11-18 David Shaw <[email protected]> + + * curl-shim.h, gpgkeys_curl.c, gpgkeys_hkp.c (main): Always show + curl version (even for curl-shim). + 2008-11-18 Werner Koch <[email protected]> * gpgkeys_curl.c (main): Print curl version according to GNU standards. diff --git a/keyserver/curl-shim.h b/keyserver/curl-shim.h index 9de7d75ea..5a0061d70 100644 --- a/keyserver/curl-shim.h +++ b/keyserver/curl-shim.h @@ -1,5 +1,5 @@ /* curl-shim.h - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. + * Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc. * * This file is part of GNUPG. * @@ -83,8 +83,6 @@ typedef struct #define CURL_GLOBAL_DEFAULT 0 #define CURLVERSION_NOW 0 -#define curl_is_gnupg_curl_shim 1 - CURLcode curl_global_init(long flags); void curl_global_cleanup(void); CURL *curl_easy_init(void); diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c index 323593e2f..c993397b9 100644 --- a/keyserver/gpgkeys_curl.c +++ b/keyserver/gpgkeys_curl.c @@ -125,9 +125,7 @@ main(int argc,char *argv[]) if (argc > 1 && !strcmp (argv[1], "--version")) { printf ("gpgkeys_curl (GnuPG) %s\n", VERSION); -#ifndef curl_is_gnupg_curl_shim - printf ("libcurl %s\n", curl_version()); -#endif /*curl_is_gnupg_curl_shim*/ + printf ("Uses: %s\n", curl_version()); return 0; } else if (argc > 1 && !strcmp (argv[1], "--help")) diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c index c21168aa1..8820e30eb 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.c @@ -518,9 +518,7 @@ main(int argc,char *argv[]) if (argc > 1 && !strcmp (argv[1], "--version")) { printf ("gpgkeys_hkp (GnuPG) %s\n", VERSION); -#ifndef curl_is_gnupg_curl_shim - printf ("libcurl %s\n", curl_version()); -#endif /*curl_is_gnupg_curl_shim*/ + printf ("Uses: %s\n", curl_version()); return 0; } else if (argc > 1 && !strcmp (argv[1], "--help")) |