summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2015-06-14 11:57:55 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2015-06-14 11:57:55 +0200
commita611e1e4dad81cde86165844b4cd078799f3f10d (patch)
tree2a1d7d7d841aae9044f8bb33c10f588369cc668c
parent9d1d5475fdf28a459b8671472026b8a9d6c42370 (diff)
Fix conflict with 'final' define when including openssl/evp.h.
-rw-r--r--test/lv2_test_host.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/test/lv2_test_host.cc b/test/lv2_test_host.cc
index 07685d0..927f94c 100644
--- a/test/lv2_test_host.cc
+++ b/test/lv2_test_host.cc
@@ -40,7 +40,17 @@
//
#include <openssl/bio.h>
#include <openssl/err.h>
-#include <openssl/evp.h>
+
+#ifdef final
+// final is used as variable name in evp.h so we need to undef it before we
+// include it.
+ #undef final
+ #include <openssl/evp.h>
+ #define final
+#else
+ #include <openssl/evp.h>
+#endif
+
#include <string>
class Base64 {
public: