diff options
| author | madmaxoft <github@xoft.cz> | 2013-08-15 09:03:58 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-08-15 09:03:58 +0200 |
| commit | 0297cf548558a20e36acac3057728ad9a9aac234 (patch) | |
| tree | 626d2e3af538ec6c5dd940a948535b9b4e867c46 /CryptoPP/misc.h | |
| parent | Merge pull request #91 from tigerw/master (diff) | |
| download | cuberite-0297cf548558a20e36acac3057728ad9a9aac234.tar cuberite-0297cf548558a20e36acac3057728ad9a9aac234.tar.gz cuberite-0297cf548558a20e36acac3057728ad9a9aac234.tar.bz2 cuberite-0297cf548558a20e36acac3057728ad9a9aac234.tar.lz cuberite-0297cf548558a20e36acac3057728ad9a9aac234.tar.xz cuberite-0297cf548558a20e36acac3057728ad9a9aac234.tar.zst cuberite-0297cf548558a20e36acac3057728ad9a9aac234.zip | |
Diffstat (limited to '')
| -rw-r--r-- | CryptoPP/misc.h | 2 |
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) |