From 401745fc302370a983aab7eb347a6ea75b7d1e2e Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 2 Jun 2015 12:52:05 +0200
Subject: -include wallet headers if compiling wallet library

---
 src/util/crypto.c |  6 ++++++
 src/util/json.c   | 25 +++++++++++++++----------
 src/util/util.c   |  6 +++++-
 3 files changed, 26 insertions(+), 11 deletions(-)

(limited to 'src/util')

diff --git a/src/util/crypto.c b/src/util/crypto.c
index 6e78259eb..590ed428b 100644
--- a/src/util/crypto.c
+++ b/src/util/crypto.c
@@ -23,7 +23,13 @@
  */
 #include "platform.h"
 #include "taler_util.h"
+
+#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
+#include <gnunet/gnunet_util_taler_wallet_lib.h>
+#endif
+#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
 #include <gnunet/gnunet_util_lib.h>
+#endif
 #include <gcrypt.h>
 
 
diff --git a/src/util/json.c b/src/util/json.c
index 34e41e0d7..606683598 100644
--- a/src/util/json.c
+++ b/src/util/json.c
@@ -19,7 +19,12 @@
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 #include "platform.h"
+#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
+#include <gnunet/gnunet_util_taler_wallet_lib.h>
+#endif
+#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
 #include <gnunet/gnunet_util_lib.h>
+#endif
 #include "taler_util.h"
 
 /**
@@ -155,7 +160,7 @@ TALER_json_from_rsa_public_key (struct GNUNET_CRYPTO_rsa_PublicKey *pk)
 /**
  * Convert JSON to RSA public key.
  *
- * @param pk JSON encoding to convert 
+ * @param pk JSON encoding to convert
  * @return corresponding public key
  */
 struct GNUNET_CRYPTO_rsa_PublicKey *
@@ -172,10 +177,10 @@ TALER_json_to_rsa_public_key (json_t *json)
   len = strlen (enc);
   buf_len =  (len * 5) / 8;
   buf = GNUNET_malloc (buf_len);
-  EXITIF (GNUNET_OK != 
-	  GNUNET_STRINGS_string_to_data (enc, 
-					 len, 
-					 buf, 
+  EXITIF (GNUNET_OK !=
+	  GNUNET_STRINGS_string_to_data (enc,
+					 len,
+					 buf,
 					 buf_len));
   EXITIF (NULL == (pk = GNUNET_CRYPTO_rsa_public_key_decode (buf,
 							     buf_len)));
@@ -190,7 +195,7 @@ TALER_json_to_rsa_public_key (json_t *json)
 /**
  * Convert JSON to RSA signature.
  *
- * @param pk JSON encoding to convert 
+ * @param pk JSON encoding to convert
  * @return corresponding signature
  */
 struct GNUNET_CRYPTO_rsa_Signature *
@@ -207,10 +212,10 @@ TALER_json_to_rsa_signature (json_t *json)
   len = strlen (enc);
   buf_len =  (len * 5) / 8;
   buf = GNUNET_malloc (buf_len);
-  EXITIF (GNUNET_OK != 
-	  GNUNET_STRINGS_string_to_data (enc, 
-					 len, 
-					 buf, 
+  EXITIF (GNUNET_OK !=
+	  GNUNET_STRINGS_string_to_data (enc,
+					 len,
+					 buf,
 					 buf_len));
   EXITIF (NULL == (sig = GNUNET_CRYPTO_rsa_signature_decode (buf,
 							     buf_len)));
diff --git a/src/util/util.c b/src/util/util.c
index 2973a11c2..6da2f3f78 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -24,8 +24,12 @@
 
 #include "platform.h"
 #include "taler_util.h"
-#include <gnunet/gnunet_common.h>
+#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
+#include <gnunet/gnunet_util_taler_wallet_lib.h>
+#endif
+#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
 #include <gnunet/gnunet_util_lib.h>
+#endif
 #include <gcrypt.h>
 
 
-- 
cgit v1.2.3