diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-07-20 10:34:32 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2015-07-20 10:34:32 +0200 |
| commit | beceb3bc1612c2af875157fc4f0e7245dcfeef02 (patch) | |
| tree | 46324b36d9a21ed57041c391ff6710c9d8eb5227 | |
| parent | 0e69c33d1f2591673887a5fa4d293e6df7431c0f (diff) | |
implementing #3905
| -rw-r--r-- | src/include/Makefile.am | 4 | ||||
| -rw-r--r-- | src/include/taler_amount_lib.h | 2 | ||||
| -rw-r--r-- | src/include/taler_crypto_lib.h | 6 | ||||
| -rw-r--r-- | src/include/taler_signatures.h | 9 | ||||
| -rw-r--r-- | src/util/amount.c | 3 |
5 files changed, 16 insertions, 8 deletions
diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 1007c1d42..bfdcbe7ca 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -6,8 +6,8 @@ talerinclude_HEADERS = \ platform.h \ taler_amount_lib.h \ taler_crypto_lib.h \ - taler_util_wallet.h - + taler_util_wallet.h \ + taler_signatures.h else talerinclude_HEADERS = \ diff --git a/src/include/taler_amount_lib.h b/src/include/taler_amount_lib.h index d0024a8a0..8661ed913 100644 --- a/src/include/taler_amount_lib.h +++ b/src/include/taler_amount_lib.h @@ -29,6 +29,8 @@ extern "C" #endif #endif +#include <gnunet/platform.h> + /** * @brief Number of characters (plus 1 for 0-termination) we use to diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h index 6509935ab..4126894a1 100644 --- a/src/include/taler_crypto_lib.h +++ b/src/include/taler_crypto_lib.h @@ -24,11 +24,11 @@ #if HAVE_GNUNET_GNUNET_UTIL_LIB_H #include <gnunet/gnunet_util_lib.h> -#endif -#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H +#include "taler_util.h" +#elif HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H #include <gnunet/gnunet_util_taler_wallet_lib.h> -#endif #include "taler_util_wallet.h" +#endif #include <gcrypt.h> diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h index bb88ff9d7..402e67fe2 100644 --- a/src/include/taler_signatures.h +++ b/src/include/taler_signatures.h @@ -28,7 +28,14 @@ #ifndef TALER_SIGNATURES_H #define TALER_SIGNATURES_H -#include "taler_util.h" +#if HAVE_GNUNET_GNUNET_UTIL_LIB_H +#include <gnunet/gnunet_util_lib.h> +#elif HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H +#include <gnunet/gnunet_util_taler_wallet_lib.h> +#endif + +#include "taler_amount_lib.h" +#include "taler_crypto_lib.h" /** * Cut-and-choose size for refreshing. Client looses the gamble (of diff --git a/src/util/amount.c b/src/util/amount.c index 424959bcc..7260b150f 100644 --- a/src/util/amount.c +++ b/src/util/amount.c @@ -24,8 +24,7 @@ #include "platform.h" #if HAVE_GNUNET_GNUNET_UTIL_LIB_H #include "taler_util.h" -#endif -#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H +#elif HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H #include "taler_util_wallet.h" #endif #include <gcrypt.h> |