From a18b8076692d9ab64c090ccb604cc2a5f7708e92 Mon Sep 17 00:00:00 2001
From: Sergey Fedorov <[EMAIL REDACTED]>
Date: Wed, 14 Aug 2024 15:56:24 +0800
Subject: [PATCH] music_*: fix remaining cases of incorrect attribute placement
(cherry picked from commit 518311a7e473c9fc3f1314b486db1c899823020f)
(cherry picked from commit 93ab764453cad3bf3d85c05c02f81ca9c6a4a173)
---
src/codecs/music_flac.c | 2 +-
src/codecs/music_gme.c | 2 +-
src/codecs/music_modplug.c | 2 +-
src/codecs/music_mpg123.c | 2 +-
src/codecs/music_ogg.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/codecs/music_flac.c b/src/codecs/music_flac.c
index 347611ef..53624ae1 100644
--- a/src/codecs/music_flac.c
+++ b/src/codecs/music_flac.c
@@ -92,11 +92,11 @@ static flac_loader flac;
if (flac.FUNC == NULL) { Mix_SetError("Missing FLAC.framework"); return -1; }
#endif
-static int FLAC_Load(void)
#ifdef __APPLE__
/* Need to turn off optimizations so weak framework load check works */
__attribute__ ((optnone))
#endif
+static int FLAC_Load(void)
{
if (flac.loaded == 0) {
#ifdef FLAC_DYNAMIC
diff --git a/src/codecs/music_gme.c b/src/codecs/music_gme.c
index 1f06522e..aaf3f07d 100644
--- a/src/codecs/music_gme.c
+++ b/src/codecs/music_gme.c
@@ -60,11 +60,11 @@ static gme_loader gme;
if (gme.FUNC == NULL) { Mix_SetError("Missing gme.framework"); return -1; }
#endif
-static int GME_Load(void)
#ifdef __APPLE__
/* Need to turn off optimizations so weak framework load check works */
__attribute__ ((optnone))
#endif
+static int GME_Load(void)
{
if (gme.loaded == 0) {
#ifdef GME_DYNAMIC
diff --git a/src/codecs/music_modplug.c b/src/codecs/music_modplug.c
index a3830655..f7d7f533 100644
--- a/src/codecs/music_modplug.c
+++ b/src/codecs/music_modplug.c
@@ -62,11 +62,11 @@ static ModPlug_Settings settings;
if (modplug.FUNC == NULL) { Mix_SetError("Missing libmodplug.framework"); return -1; }
#endif
-static int MODPLUG_Load(void)
#ifdef __APPLE__
/* Need to turn off optimizations so weak framework load check works */
__attribute__ ((optnone))
#endif
+static int MODPLUG_Load(void)
{
if (modplug.loaded == 0) {
#ifdef MODPLUG_DYNAMIC
diff --git a/src/codecs/music_mpg123.c b/src/codecs/music_mpg123.c
index e7fade71..7d09147b 100644
--- a/src/codecs/music_mpg123.c
+++ b/src/codecs/music_mpg123.c
@@ -81,11 +81,11 @@ static mpg123_loader mpg123;
if (mpg123.FUNC == NULL) { Mix_SetError("Missing mpg123.framework"); return -1; }
#endif
-static int MPG123_Load(void)
#ifdef __APPLE__
/* Need to turn off optimizations so weak framework load check works */
__attribute__ ((optnone))
#endif
+static int MPG123_Load(void)
{
if (mpg123.loaded == 0) {
#ifdef MPG123_DYNAMIC
diff --git a/src/codecs/music_ogg.c b/src/codecs/music_ogg.c
index e4d9e085..216206cd 100644
--- a/src/codecs/music_ogg.c
+++ b/src/codecs/music_ogg.c
@@ -73,11 +73,11 @@ static vorbis_loader vorbis;
if (vorbis.FUNC == NULL) { Mix_SetError("Missing vorbis.framework or tremor.framework"); return -1; }
#endif
-static int OGG_Load(void)
#ifdef __APPLE__
/* Need to turn off optimizations so weak framework load check works */
__attribute__ ((optnone))
#endif
+static int OGG_Load(void)
{
if (vorbis.loaded == 0) {
#ifdef OGG_DYNAMIC