From 4756ff3046e88ea141de7059a3c354f75cb3c36c Mon Sep 17 00:00:00 2001
From: Simon Giesecke <simon.giesecke@gmail.com>
Date: Sun, 14 Jul 2019 17:41:01 +0200
Subject: [PATCH] Problem: use of tweetnacl vs. libsodium is ambiguous

Solution: properly set defines from test_security_curve
---
 tests/test_security_curve.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/test_security_curve.cpp b/tests/test_security_curve.cpp
index f35540a6..509a9be1 100644
--- a/tests/test_security_curve.cpp
+++ b/tests/test_security_curve.cpp
@@ -27,6 +27,21 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+// TODO remove this workaround for handling libsodium/tweetnacl
+
+#if defined ZMQ_CUSTOM_PLATFORM_HPP
+#include "platform.hpp"
+#else
+#include "../src/platform.hpp"
+#endif
+
+#ifndef ZMQ_USE_TWEETNACL
+#define ZMQ_USE_TWEETNACL
+#endif
+#ifdef ZMQ_USE_LIBSODIUM
+#undef ZMQ_USE_LIBSODIUM
+#endif
+
 #include "testutil.hpp"
 #include "testutil_security.hpp"
 #if defined(ZMQ_HAVE_WINDOWS)