From f1d0e2834eb418722db8f4ff7a882518e2ebcdb8 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 7 Oct 2024 23:01:03 +0200 Subject: [PATCH] proper inline M_Memcpy --- src/doomdef.h | 7 ++++++- src/m_misc.c | 5 ----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/doomdef.h b/src/doomdef.h index 7156f06e6..45a270ff8 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -469,7 +469,12 @@ void M_StartupLocale(void); // M_GetText function that just returns the string. #define M_GetText(x) (x) #endif -void *M_Memcpy(void* dest, const void* src, size_t n); + +FUNCINLINE static ATTRINLINE void *M_Memcpy(void *dest, const void *src, size_t n) +{ + return memcpy(dest, src, n); +} + 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 c6e4bca8f..aec2aad1d 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -2065,11 +2065,6 @@ char *sizeu5(size_t num) return sizeu5_buf; } -FUNCINLINE ATTRINLINE void *M_Memcpy(void *dest, const void *src, size_t n) -{ - return memcpy(dest, src, n); -} - /** Return the appropriate message for a file error or end of file. */ const char *M_FileError(FILE *fp)