0
0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-26 23:01:04 +08:00

Problem: use of tweetnacl vs. libsodium is ambiguous

Solution: properly set defines from test_security_curve
This commit is contained in:
Simon Giesecke 2019-07-14 17:41:01 +02:00
parent 1781cff37b
commit 4756ff3046

View File

@ -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)