summaryrefslogtreecommitdiffstats
path: root/CryptoPP/misc.h
diff options
context:
space:
mode:
authorAlexander Harkness <bearbin@gmail.com>2013-08-15 18:53:45 +0200
committerAlexander Harkness <bearbin@gmail.com>2013-08-15 18:53:45 +0200
commit54c8bf2e978b883aad984549c946386d50160c0e (patch)
treeea1ca93ff5607cf1c626bc102fb9961e22bf5984 /CryptoPP/misc.h
parentFixed the Reload and Save-all console commands. (diff)
parentUpdated the makefile to disable assembly for clang. (diff)
downloadcuberite-54c8bf2e978b883aad984549c946386d50160c0e.tar
cuberite-54c8bf2e978b883aad984549c946386d50160c0e.tar.gz
cuberite-54c8bf2e978b883aad984549c946386d50160c0e.tar.bz2
cuberite-54c8bf2e978b883aad984549c946386d50160c0e.tar.lz
cuberite-54c8bf2e978b883aad984549c946386d50160c0e.tar.xz
cuberite-54c8bf2e978b883aad984549c946386d50160c0e.tar.zst
cuberite-54c8bf2e978b883aad984549c946386d50160c0e.zip
Diffstat (limited to 'CryptoPP/misc.h')
-rw-r--r--CryptoPP/misc.h2
1 files changed, 1 insertions, 1 deletions
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)