diff options
| author | David Shaw <dshaw@jabberwocky.com> | 2006-04-26 23:48:29 +0200 |
|---|---|---|
| committer | David Shaw <dshaw@jabberwocky.com> | 2006-04-26 23:48:29 +0200 |
| commit | e87d36ccf624d2bbb731a0187e0bcff94243d83d (patch) | |
| tree | 929d931a82d14d4af3389f643355863f9757d047 /keyserver/ksutil.c | |
| parent | * keyserver.c: Fix build problem with platforms that stick libcurl in (diff) | |
| download | gnupg2-e87d36ccf624d2bbb731a0187e0bcff94243d83d.tar.xz gnupg2-e87d36ccf624d2bbb731a0187e0bcff94243d83d.zip | |
* Makefile.am: Don't build gpgkeys_http or gpgkeys_(old)hkp any longer as
this is done via curl or fake-curl.
* ksutil.h, ksutil.c, gpgkeys_hkp.c, gpgkeys_curl.c: Minor #include tweaks
as FAKE_CURL is no longer meaningful.
Diffstat (limited to 'keyserver/ksutil.c')
| -rw-r--r-- | keyserver/ksutil.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/keyserver/ksutil.c b/keyserver/ksutil.c index 9bd697fff..64912bb2d 100644 --- a/keyserver/ksutil.c +++ b/keyserver/ksutil.c @@ -1,5 +1,5 @@ /* ksutil.c - general keyserver utility functions - * Copyright (C) 2004, 2005 Free Software Foundation, Inc. + * Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -29,10 +29,8 @@ #ifdef HAVE_LIBCURL #include <curl/curl.h> #else -#ifdef FAKE_CURL #include "curl-shim.h" #endif -#endif #include "keyserver.h" #include "ksutil.h" @@ -380,7 +378,6 @@ classify_ks_search(const char **search) } } -#if defined (HAVE_LIBCURL) || defined (FAKE_CURL) int curl_err_to_gpg_err(CURLcode error) { @@ -541,4 +538,3 @@ curl_writer_finalize(struct curl_writer_ctx *ctx) ctx->flags.done=1; } } -#endif |