diff options
| author | Johannes Schickel | 2011-10-28 12:32:14 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-10-28 12:32:14 +0200 |
| commit | 38aa82a4f502fd913a402c9183364ebfa4f85cce (patch) | |
| tree | 343e4b59113d95dd6cb86b8560531c61b7c1e477 | |
| parent | 3ddb6c0c903f478b91a8965d3433a9f79ce16ba7 (diff) | |
| download | scummvm-rg350-38aa82a4f502fd913a402c9183364ebfa4f85cce.tar.gz scummvm-rg350-38aa82a4f502fd913a402c9183364ebfa4f85cce.tar.bz2 scummvm-rg350-38aa82a4f502fd913a402c9183364ebfa4f85cce.zip | |
AUDIO: Fix conditional compilation of maxtrax and tfmx code.
This is a regression from 3ddb6c0c903f478b91a8965d3433a9f79ce16ba7.
| -rw-r--r-- | audio/mods/maxtrax.cpp | 4 | ||||
| -rw-r--r-- | audio/mods/tfmx.cpp | 4 | ||||
| -rw-r--r-- | audio/mods/tfmx.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/audio/mods/maxtrax.cpp b/audio/mods/maxtrax.cpp index 344d678b76..8ed51ae5c3 100644 --- a/audio/mods/maxtrax.cpp +++ b/audio/mods/maxtrax.cpp @@ -29,7 +29,7 @@ #include "audio/mods/maxtrax.h" // test for engines using this class. -#if defined(SOUND_MODS_MAXTRAX_H) +#if defined(AUDIO_MODS_MAXTRAX_H) namespace { @@ -1034,4 +1034,4 @@ void MaxTrax::outPutScore(const Score &sc, int num) {} } // End of namespace Audio -#endif // #if defined(SOUND_MODS_MAXTRAX_H) +#endif // #if defined(AUDIO_MODS_MAXTRAX_H) diff --git a/audio/mods/tfmx.cpp b/audio/mods/tfmx.cpp index a89da78af1..8d584809c8 100644 --- a/audio/mods/tfmx.cpp +++ b/audio/mods/tfmx.cpp @@ -29,7 +29,7 @@ #include "audio/mods/tfmx.h" // test for engines using this class. -#if defined(SOUND_MODS_TFMX_H) +#if defined(AUDIO_MODS_TFMX_H) // couple debug-functions namespace { @@ -1187,4 +1187,4 @@ void displayPatternstep(const void * const vptr) { } // End of anonymous namespace #endif -#endif // #if defined(SOUND_MODS_TFMX_H) +#endif // #if defined(AUDIO_MODS_TFMX_H) diff --git a/audio/mods/tfmx.h b/audio/mods/tfmx.h index 26099f969d..4174fbfb27 100644 --- a/audio/mods/tfmx.h +++ b/audio/mods/tfmx.h @@ -24,7 +24,7 @@ #if !defined(ENABLE_SCUMM) // normal Header Guard -#elif !defined(SOUND_MODS_TFMX_H) +#elif !defined(AUDIO_MODS_TFMX_H) #define AUDIO_MODS_TFMX_H #include "audio/mods/paula.h" @@ -278,4 +278,4 @@ private: } // End of namespace Audio -#endif // !defined(SOUND_MODS_TFMX_H) +#endif // !defined(AUDIO_MODS_TFMX_H) |