diff --git a/src/doomdef.h b/src/doomdef.h index 4b900b3cc..26188e33f 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -469,7 +469,11 @@ void M_StartupLocale(void); #define M_GetText(x) (x) #endif void *M_Memcpy(void* dest, const void* src, size_t n); +#if defined(_WIN32) && defined(__MINGW64__) void *memcpy_fast(void *destination, const void *source, size_t size); +#else +#define memcpy_fast(dest, src, n) memcpy(dest, src, n) +#endif char *va(const char *format, ...) FUNCPRINTF; char *M_GetToken(const char *inputString); char *sizeu1(size_t num); diff --git a/src/m_misc.c b/src/m_misc.c index dbed5aaf0..385545601 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -1946,9 +1946,18 @@ char *sizeu5(size_t num) }*/ void *M_Memcpy(void *dest, const void *src, size_t n) +#if defined(_WIN32) && defined(__MINGW64__) { return memcpy_fast(dest, src, n); } +#else +{ + return memcpy(dest, src, n); +} +#endif + + +#if defined(_WIN32) && defined(__MINGW64__) #include #include @@ -2427,6 +2436,8 @@ void* memcpy_fast(void *destination, const void *source, size_t size) } #pragma GCC diagnostic pop +#endif + /** Return the appropriate message for a file error or end of file. */ const char *M_FileError(FILE *fp)