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 /src/include/taler_crypto_lib.h | |
| parent | 1df4f8114e6ea4c0f7e3baa4fce8901a9bc2eaba (diff) | |
| parent | 08358cade02e436a6dbd3a7798a8fa42afbb0aae (diff) | |
Merge branch 'master' of taler.net:/var/git/mint
Diffstat (limited to 'src/include/taler_crypto_lib.h')
| -rw-r--r-- | src/include/taler_crypto_lib.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h index 6509935a..4126894a 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> |