Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #9889 from leoetlino/ax-symbols
DSPHLE: Prevent AX GC and AX Wii symbol mixups
  • Loading branch information
Tilka committed Jul 13, 2021
2 parents edc4396 + 474adcc commit 8fcda4c
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h
Expand Up @@ -32,8 +32,14 @@ namespace DSP::HLE
#define MAX_SAMPLES_PER_FRAME 96
#endif

// Put all of that in an anonymous namespace to avoid stupid compilers merging
// Use an inline namespace to prevent stupid compilers and debuggers from merging
// functions from AX GC and AX Wii.
#ifdef AX_GC
inline namespace AXGC
#else
inline namespace AXWii
#endif
{
namespace
{
// Useful macro to convert xxx_hi + xxx_lo to xxx for 32 bits.
Expand Down Expand Up @@ -541,4 +547,5 @@ void ProcessVoice(PB_TYPE& pb, const AXBuffers& buffers, u16 count, AXMixControl
}

} // namespace
} // inline namespace AXGC/AXWii
} // namespace DSP::HLE

0 comments on commit 8fcda4c

Please sign in to comment.