diff options
| author | Luke Street <luke@street.dev> | 2026-02-28 13:11:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-28 12:11:00 -0800 |
| commit | c900a043b89786d5e594ec883d9acd92e0db6bc7 (patch) | |
| tree | 72aa155ca8fcb6d1234ccec7a527fcf02745d6ac /src/Z2AudioLib | |
| parent | d017a3cd36dacdcbd6a62640a85b8715540d82e5 (diff) | |
Some GCC compilation fixes (#3114)
* Fix 6-byte multichar literals
* Add `struct` to `e_ga_class::ga_s`
* Fix remaining wrong forward declares (struct/class)
* Replace `#include <string>` with `#include <cstring>`
* Guard FLT_EPSILON define to prevent redefinition
* Add missing `#include <cstring>` for direct cstring function usage
Diffstat (limited to 'src/Z2AudioLib')
| -rw-r--r-- | src/Z2AudioLib/Z2AudioArcLoader.cpp | 1 | ||||
| -rw-r--r-- | src/Z2AudioLib/Z2SceneMgr.cpp | 1 | ||||
| -rw-r--r-- | src/Z2AudioLib/Z2SoundObjMgr.cpp | 1 | ||||
| -rw-r--r-- | src/Z2AudioLib/Z2StatusMgr.cpp | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/src/Z2AudioLib/Z2AudioArcLoader.cpp b/src/Z2AudioLib/Z2AudioArcLoader.cpp index 93343014c5..1b4ab57e91 100644 --- a/src/Z2AudioLib/Z2AudioArcLoader.cpp +++ b/src/Z2AudioLib/Z2AudioArcLoader.cpp @@ -5,6 +5,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "Z2AudioLib/Z2FxLineMgr.h" #include "m_Do/m_Do_ext.h" +#include <cstring> Z2AudioArcLoader::Z2AudioArcLoader(JAUSection* section) : JAUAudioArcLoader(section) {} diff --git a/src/Z2AudioLib/Z2SceneMgr.cpp b/src/Z2AudioLib/Z2SceneMgr.cpp index 3aa7e99950..9e3bf2c91c 100644 --- a/src/Z2AudioLib/Z2SceneMgr.cpp +++ b/src/Z2AudioLib/Z2SceneMgr.cpp @@ -11,6 +11,7 @@ #include "Z2AudioLib/Z2SoundObjMgr.h" #include "Z2AudioLib/Z2StatusMgr.h" #include "d/d_com_inf_game.h" +#include <cstring> Z2SceneMgr::Z2SceneMgr() : JASGlobalInstance<Z2SceneMgr>(true) { sceneNum = -1; diff --git a/src/Z2AudioLib/Z2SoundObjMgr.cpp b/src/Z2AudioLib/Z2SoundObjMgr.cpp index a1d87e6633..6b080134fb 100644 --- a/src/Z2AudioLib/Z2SoundObjMgr.cpp +++ b/src/Z2AudioLib/Z2SoundObjMgr.cpp @@ -4,6 +4,7 @@ #include "Z2AudioLib/Z2Calc.h" #include "Z2AudioLib/Z2SceneMgr.h" #include "Z2AudioLib/Z2LinkMgr.h" +#include <cstring> Z2SoundObjMgr::Z2SoundObjMgr() : JASGlobalInstance<Z2SoundObjMgr>(true) { ghostEnemyState_ = 0; diff --git a/src/Z2AudioLib/Z2StatusMgr.cpp b/src/Z2AudioLib/Z2StatusMgr.cpp index c86b86eee3..fd907b48c8 100644 --- a/src/Z2AudioLib/Z2StatusMgr.cpp +++ b/src/Z2AudioLib/Z2StatusMgr.cpp @@ -2,6 +2,7 @@ #include "Z2AudioLib/Z2Param.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" +#include <cstring> static const char* sSpotName[] = { "F_SP00", |