gnupg/keyserver (ChangeLog ksutil.c ksutil.h)

[cvs user dshaw]

    Date: Wednesday, May 4, 2005 @ 15:34:25
  Author: dshaw
    Path: /cvs/gnupg/gnupg/keyserver

Modified: ChangeLog ksutil.c ksutil.h

* ksutil.h, ksutil.c: #ifdef so we can build without libcurl or
fake-curl.


-----------+
 ChangeLog |    5 +++++
 ksutil.c  |    9 +++++++--
 ksutil.h  |    9 +++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)


Index: gnupg/keyserver/ChangeLog
diff -u gnupg/keyserver/ChangeLog:1.127 gnupg/keyserver/ChangeLog:1.128
--- gnupg/keyserver/ChangeLog:1.127	Wed May  4 04:46:02 2005
+++ gnupg/keyserver/ChangeLog	Wed May  4 15:34:25 2005
@@ -1,3 +1,8 @@
+2005-05-04  David Shaw  <dshaw at jabberwocky.com>
+
+	* ksutil.h, ksutil.c: #ifdef so we can build without libcurl or
+	fake-curl.
+
 2005-05-03  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpgkeys_http.c: Need GET defined.
Index: gnupg/keyserver/ksutil.c
diff -u gnupg/keyserver/ksutil.c:1.8 gnupg/keyserver/ksutil.c:1.9
--- gnupg/keyserver/ksutil.c:1.8	Sun Apr 17 03:52:04 2005
+++ gnupg/keyserver/ksutil.c	Wed May  4 15:34:25 2005
@@ -24,10 +24,13 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+
+#ifdef HAVE_LIBCURL
+#include <curl/curl.h>
+#else
 #ifdef FAKE_CURL
 #include "curl-shim.h"
-#else
-#include <curl/curl.h>
+#endif
 #endif
 #include "keyserver.h"
 #include "ksutil.h"
@@ -318,6 +321,7 @@
     }
 }
 
+#if defined (HAVE_LIBCURL) || defined (FAKE_CURL)
 int
 curl_err_to_gpg_err(CURLcode error)
 {
@@ -383,3 +387,4 @@
 
   return size*nmemb;
 }
+#endif
Index: gnupg/keyserver/ksutil.h
diff -u gnupg/keyserver/ksutil.h:1.11 gnupg/keyserver/ksutil.h:1.12
--- gnupg/keyserver/ksutil.h:1.11	Mon May  2 02:46:39 2005
+++ gnupg/keyserver/ksutil.h	Wed May  4 15:34:25 2005
@@ -21,10 +21,12 @@
 #ifndef _KSUTIL_H_
 #define _KSUTIL_H_
 
+#ifdef HAVE_LIBCURL
+#include <curl/curl.h>
+#else
 #ifdef FAKE_CURL
 #include "curl-shim.h"
-#else
-#include <curl/curl.h>
+#endif
 #endif
 
 /* MAX_LINE must be at least 1 larger than the largest item we expect
@@ -98,6 +100,8 @@
 int parse_ks_options(char *line,struct ks_options *opt);
 const char *ks_action_to_string(enum ks_action action);
 void print_nocr(FILE *stream,const char *str);
+
+#if defined (HAVE_LIBCURL) || defined (FAKE_CURL)
 int curl_err_to_gpg_err(CURLcode error);
 
 struct curl_writer_ctx
@@ -108,5 +112,6 @@
 };
 
 size_t curl_writer(const void *ptr,size_t size,size_t nmemb,void *cw_ctx);
+#endif
 
 #endif /* !_KSUTIL_H_ */