From 0297cf548558a20e36acac3057728ad9a9aac234 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Thu, 15 Aug 2013 09:03:58 +0200
Subject: Updated CryptoPP to 5.6.2

---
 CryptoPP/misc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CryptoPP/misc.h')

diff --git a/CryptoPP/misc.h b/CryptoPP/misc.h
index 7f32b860b..2b326dd60 100644
--- a/CryptoPP/misc.h
+++ b/CryptoPP/misc.h
@@ -141,7 +141,7 @@ const T & Singleton<T, F, instance>::Ref(CRYPTOPP_NOINLINE_DOTDOTDOT) const
 
 // ************** misc functions ***************
 
-#if (!__STDC_WANT_SECURE_LIB__)
+#if (!__STDC_WANT_SECURE_LIB__ && !defined(_MEMORY_S_DEFINED))
 inline void memcpy_s(void *dest, size_t sizeInBytes, const void *src, size_t count)
 {
 	if (count > sizeInBytes)
-- 
cgit v1.2.3