From 820bb5e39d389fd87d04236d7c9e26df006e9084 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Sun, 1 Dec 2019 18:50:02 +0300 Subject: [PATCH] external libs, libmodplug: Fix -Wregister warnings from new gcc: warning: ISO C++17 does not allow 'register' storage class specifier Noticed in a commit authored by Vitaly Novichkov. --- external/libmodplug-0.8.9.0/src/fastmix.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/external/libmodplug-0.8.9.0/src/fastmix.cpp b/external/libmodplug-0.8.9.0/src/fastmix.cpp index 9c4d8922..7aad3731 100644 --- a/external/libmodplug-0.8.9.0/src/fastmix.cpp +++ b/external/libmodplug-0.8.9.0/src/fastmix.cpp @@ -287,8 +287,14 @@ CzWINDOWEDFIR sfir; // ---------------------------------------------------------------------------- // MIXING MACROS // ---------------------------------------------------------------------------- +#if defined(__cplusplus) && (__cplusplus >= 201402L) +#define REGISTER +#else +#define REGISTER register +#endif + #define SNDMIX_BEGINSAMPLELOOP8\ - register MODCHANNEL * const pChn = pChannel;\ + REGISTER MODCHANNEL * const pChn = pChannel;\ nPos = pChn->nPosLo;\ const signed char *p = (signed char *)(pChn->pCurrentSample+pChn->nPos);\ if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\ @@ -296,7 +302,7 @@ CzWINDOWEDFIR sfir; do { #define SNDMIX_BEGINSAMPLELOOP16\ - register MODCHANNEL * const pChn = pChannel;\ + REGISTER MODCHANNEL * const pChn = pChannel;\ nPos = pChn->nPosLo;\ const signed short *p = (signed short *)(pChn->pCurrentSample+(pChn->nPos*2));\ if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\