Merge remote-tracking branch 'next' into merge-srb2

This commit is contained in:
SeventhSentinel 2019-01-06 02:02:33 -05:00
commit e545a8ab7d

View file

@ -936,7 +936,6 @@ static void IdentifyVersion(void)
#endif #endif
#if !defined (HAVE_SDL) || defined (HAVE_MIXER) #if !defined (HAVE_SDL) || defined (HAVE_MIXER)
{
#define MUSICTEST(str) \ #define MUSICTEST(str) \
{\ {\
const char *musicpath = va(pandf,srb2waddir,str);\ const char *musicpath = va(pandf,srb2waddir,str);\
@ -948,7 +947,7 @@ static void IdentifyVersion(void)
} }
MUSICTEST("sounds.kart") MUSICTEST("sounds.kart")
MUSICTEST("music.kart") MUSICTEST("music.kart")
} #undef MUSICTEST
#endif #endif
} }