diff options
| author | Fournier Nicolas <nicolas.fournier@ensta-paristech.fr> | 2015-07-20 10:42:52 +0200 |
|---|---|---|
| committer | Fournier Nicolas <nicolas.fournier@ensta-paristech.fr> | 2015-07-20 10:42:52 +0200 |
| commit | 2cd4d6a4736affc4d10af9d4b285c681bda34835 (patch) | |
| tree | 6a993ac580aedf1e663b1317865b15142e6a53fc | |
| parent | 1df4f8114e6ea4c0f7e3baa4fce8901a9bc2eaba (diff) | |
| parent | 08358cade02e436a6dbd3a7798a8fa42afbb0aae (diff) | |
| download | exchange-2cd4d6a4736affc4d10af9d4b285c681bda34835.tar.xz | |
Merge branch 'master' of taler.net:/var/git/mint
| -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> |