mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-08 12:44:23 +01:00
* ksutil.h, ksutil.c: #ifdef so we can build without libcurl or
fake-curl.
This commit is contained in:
parent
049195f9e0
commit
d9d902dffb
@ -1,3 +1,8 @@
|
|||||||
|
2005-05-04 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
|
* ksutil.h, ksutil.c: #ifdef so we can build without libcurl or
|
||||||
|
fake-curl.
|
||||||
|
|
||||||
2005-05-03 David Shaw <dshaw@jabberwocky.com>
|
2005-05-03 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
* gpgkeys_http.c: Need GET defined.
|
* gpgkeys_http.c: Need GET defined.
|
||||||
|
@ -24,10 +24,13 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBCURL
|
||||||
|
#include <curl/curl.h>
|
||||||
|
#else
|
||||||
#ifdef FAKE_CURL
|
#ifdef FAKE_CURL
|
||||||
#include "curl-shim.h"
|
#include "curl-shim.h"
|
||||||
#else
|
#endif
|
||||||
#include <curl/curl.h>
|
|
||||||
#endif
|
#endif
|
||||||
#include "keyserver.h"
|
#include "keyserver.h"
|
||||||
#include "ksutil.h"
|
#include "ksutil.h"
|
||||||
@ -318,6 +321,7 @@ print_nocr(FILE *stream,const char *str)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined (HAVE_LIBCURL) || defined (FAKE_CURL)
|
||||||
int
|
int
|
||||||
curl_err_to_gpg_err(CURLcode error)
|
curl_err_to_gpg_err(CURLcode error)
|
||||||
{
|
{
|
||||||
@ -383,3 +387,4 @@ curl_writer(const void *ptr,size_t size,size_t nmemb,void *cw_ctx)
|
|||||||
|
|
||||||
return size*nmemb;
|
return size*nmemb;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
@ -21,10 +21,12 @@
|
|||||||
#ifndef _KSUTIL_H_
|
#ifndef _KSUTIL_H_
|
||||||
#define _KSUTIL_H_
|
#define _KSUTIL_H_
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBCURL
|
||||||
|
#include <curl/curl.h>
|
||||||
|
#else
|
||||||
#ifdef FAKE_CURL
|
#ifdef FAKE_CURL
|
||||||
#include "curl-shim.h"
|
#include "curl-shim.h"
|
||||||
#else
|
#endif
|
||||||
#include <curl/curl.h>
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* MAX_LINE must be at least 1 larger than the largest item we expect
|
/* MAX_LINE must be at least 1 larger than the largest item we expect
|
||||||
@ -98,6 +100,8 @@ void free_ks_options(struct ks_options *opt);
|
|||||||
int parse_ks_options(char *line,struct ks_options *opt);
|
int parse_ks_options(char *line,struct ks_options *opt);
|
||||||
const char *ks_action_to_string(enum ks_action action);
|
const char *ks_action_to_string(enum ks_action action);
|
||||||
void print_nocr(FILE *stream,const char *str);
|
void print_nocr(FILE *stream,const char *str);
|
||||||
|
|
||||||
|
#if defined (HAVE_LIBCURL) || defined (FAKE_CURL)
|
||||||
int curl_err_to_gpg_err(CURLcode error);
|
int curl_err_to_gpg_err(CURLcode error);
|
||||||
|
|
||||||
struct curl_writer_ctx
|
struct curl_writer_ctx
|
||||||
@ -108,5 +112,6 @@ struct curl_writer_ctx
|
|||||||
};
|
};
|
||||||
|
|
||||||
size_t curl_writer(const void *ptr,size_t size,size_t nmemb,void *cw_ctx);
|
size_t curl_writer(const void *ptr,size_t size,size_t nmemb,void *cw_ctx);
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* !_KSUTIL_H_ */
|
#endif /* !_KSUTIL_H_ */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user