From 051507e26603da409780d8de9e66015ac6d92ef6 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Tue, 29 Jul 2014 08:55:53 -0700
Subject: [PATCH] Check for Windows-specific functions by checking _WIN32, not
 HAVE_* definitions

---
 src/libsodium/sodium/utils.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libsodium/sodium/utils.c b/src/libsodium/sodium/utils.c
index eff9d0cd..6587eb3b 100644
--- a/src/libsodium/sodium/utils.c
+++ b/src/libsodium/sodium/utils.c
@@ -31,7 +31,7 @@ __sodium_dummy_symbol_to_prevent_lto(void * const pnt, const size_t len)
 void
 sodium_memzero(void * const pnt, const size_t len)
 {
-#ifdef HAVE_SECUREZEROMEMORY
+#ifdef _WIN32
     SecureZeroMemory(pnt, len);
 #elif defined(HAVE_MEMSET_S)
     if (memset_s(pnt, (rsize_t) len, 0, (rsize_t) len) != 0) {
@@ -178,7 +178,7 @@ sodium_mlock(void * const addr, const size_t len)
 #endif
 #ifdef HAVE_MLOCK
     return mlock(addr, len);
-#elif defined(HAVE_VIRTUALLOCK)
+#elif defined(_WIN32)
     return -(VirtualLock(addr, len) == 0);
 #else
     errno = ENOSYS;
@@ -195,7 +195,7 @@ sodium_munlock(void * const addr, const size_t len)
 #endif
 #ifdef HAVE_MLOCK
     return munlock(addr, len);
-#elif defined(HAVE_VIRTUALLOCK)
+#elif defined(_WIN32)
     return -(VirtualUnlock(addr, len) == 0);
 #else
     errno = ENOSYS;