mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* 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.
This commit is contained in:
parent
19c353232e
commit
e87d36ccf6
6 changed files with 21 additions and 30 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue