summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-09-20 07:53:24 +0000
committerSander Vrijders <sander.vrijders@ugent.be>2017-09-20 07:53:24 +0000
commitf9fd352f38c3c3d9e7824b8cf84b8f86e2a6d392 (patch)
treecbb01b76f47c50e7bf86443d0bb37747b41b8cff /src/lib
parent476a3fe224554780b5737ac8db8f9fd39b32fe14 (diff)
parentc665c71719225ef6d076c6be24c588049527f31f (diff)
downloadouroboros-f9fd352f38c3c3d9e7824b8cf84b8f86e2a6d392.tar.gz
ouroboros-f9fd352f38c3c3d9e7824b8cf84b8f86e2a6d392.zip
Merged in dstaesse/ouroboros/be-gcrypt-init (pull request #602)
irmd: Init libgcrypt before using it
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/CMakeLists.txt2
-rw-r--r--src/lib/dev.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 6f1cfbb3..fa6254bf 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -76,7 +76,7 @@ if (LIBGCRYPT_LIBRARIES)
set (DISABLE_LIBGCRYPT FALSE CACHE BOOL "Disable libgcrypt support")
if (NOT DISABLE_LIBGCRYPT)
message(STATUS "libgcrypt support enabled")
- set(HAVE_LIBGCRYPT TRUE)
+ set(HAVE_LIBGCRYPT TRUE CACHE INTERNAL "")
else ()
message(STATUS "libgcrypt support disabled by user")
endif()
diff --git a/src/lib/dev.c b/src/lib/dev.c
index b945968d..9cb6f2ed 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -676,8 +676,7 @@ int ouroboros_init(const char * ap_name)
if (pthread_rwlock_init(&ai.lock, NULL))
goto fail_lock;
- ai.tw = timerwheel_create(TW_RESOLUTION,
- TW_RESOLUTION * TW_ELEMENTS);
+ ai.tw = timerwheel_create(TW_RESOLUTION, TW_RESOLUTION * TW_ELEMENTS);
if (ai.tw == NULL)
goto fail_timerwheel;