diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-01-10 11:50:58 +0100 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-01-10 11:50:58 +0100 |
| commit | ab8a32429a2394e183d3d999859017c51cc0b469 (patch) | |
| tree | 6a0d636d4cddcf254e98aa55d72c26e8bbf8ec65 /src/crypto | |
| parent | Merge pull request #2983 (diff) | |
| parent | fix some link errors in debug mode for macos (diff) | |
| download | monero-ab8a32429a2394e183d3d999859017c51cc0b469.tar.xz | |
Merge pull request #2985
6d8b29ef fix some link errors in debug mode for macos (stoffu)
fdd4c5e5 move memwipe to epee to avoid common<->crypto circular dependencies (moneromooo-monero)
40ab12a7 epee: remove dependency on common (moneromooo-monero)
Diffstat (limited to 'src/crypto')
| -rw-r--r-- | src/crypto/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/crypto/chacha.h | 2 | ||||
| -rw-r--r-- | src/crypto/crypto.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt index fd71a87e7..764b30273 100644 --- a/src/crypto/CMakeLists.txt +++ b/src/crypto/CMakeLists.txt @@ -76,6 +76,7 @@ monero_add_library(cncrypto ${crypto_private_headers}) target_link_libraries(cncrypto PUBLIC + epee ${Boost_SYSTEM_LIBRARY} PRIVATE ${EXTRA_LIBRARIES}) diff --git a/src/crypto/chacha.h b/src/crypto/chacha.h index a9665030d..c11e4aa2f 100644 --- a/src/crypto/chacha.h +++ b/src/crypto/chacha.h @@ -39,7 +39,7 @@ #if defined(__cplusplus) #include <memory.h> -#include "common/memwipe.h" +#include "memwipe.h" #include "hash.h" namespace crypto { diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h index 0ce5e6d7a..a929302c1 100644 --- a/src/crypto/crypto.h +++ b/src/crypto/crypto.h @@ -41,7 +41,7 @@ #include "common/pod-class.h" #include "common/util.h" -#include "common/memwipe.h" +#include "memwipe.h" #include "generic-ops.h" #include "hex.h" #include "span.h" |