diff options
| author | Johannes Schickel | 2012-03-17 22:02:16 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2012-03-17 22:02:44 +0100 |
| commit | 223794fb383637944c3b161c04ecc233a354c9ae (patch) | |
| tree | d28b6822b93e7ee764c669657368ff38f9b08e97 /audio | |
| parent | 2c0bd426fcd2d965ca5f84fde893719ddfc4c37f (diff) | |
| download | scummvm-rg350-223794fb383637944c3b161c04ecc233a354c9ae.tar.gz scummvm-rg350-223794fb383637944c3b161c04ecc233a354c9ae.tar.bz2 scummvm-rg350-223794fb383637944c3b161c04ecc233a354c9ae.zip | |
ALL: Make use of defined() for the preprocessor consistent.
This does not change the use of defined for some NDS source files, since they
seem to be (based on?) third party code.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/mods/maxtrax.h | 4 | ||||
| -rw-r--r-- | audio/softsynth/mt32/Structures.h | 4 | ||||
| -rw-r--r-- | audio/softsynth/opl/mame.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/audio/mods/maxtrax.h b/audio/mods/maxtrax.h index c61f4e1b50..c45a21a255 100644 --- a/audio/mods/maxtrax.h +++ b/audio/mods/maxtrax.h @@ -24,7 +24,7 @@ #if !defined(ENABLE_KYRA) // normal Header Guard -#elif !defined AUDIO_MODS_MAXTRAX_H +#elif !defined(AUDIO_MODS_MAXTRAX_H) #define AUDIO_MODS_MAXTRAX_H // #define MAXTRAX_HAS_MODULATION @@ -219,4 +219,4 @@ private: }; } // End of namespace Audio -#endif // !defined AUDIO_MODS_MAXTRAX_H +#endif // !defined(AUDIO_MODS_MAXTRAX_H) diff --git a/audio/softsynth/mt32/Structures.h b/audio/softsynth/mt32/Structures.h index e4d98ad1fc..cbce89ae18 100644 --- a/audio/softsynth/mt32/Structures.h +++ b/audio/softsynth/mt32/Structures.h @@ -42,7 +42,7 @@ typedef signed char Bit8s; // Since sysex allows this memory to be written to in blocks of bytes, // we keep this packed so that we can copy data into the various // banks directly -#if defined(_MSC_VER) || defined (__MINGW32__) +#if defined(_MSC_VER) || defined(__MINGW32__) #pragma pack(push, 1) #else #pragma pack(1) @@ -172,7 +172,7 @@ struct MemParams { } MT32EMU_ALIGN_PACKED system; }; -#if defined(_MSC_VER) || defined (__MINGW32__) +#if defined(_MSC_VER) || defined(__MINGW32__) #pragma pack(pop) #else #pragma pack() diff --git a/audio/softsynth/opl/mame.cpp b/audio/softsynth/opl/mame.cpp index dd3c354045..c54f620a10 100644 --- a/audio/softsynth/opl/mame.cpp +++ b/audio/softsynth/opl/mame.cpp @@ -33,7 +33,7 @@ #include "common/textconsole.h" #include "common/util.h" -#if defined (_WIN32_WCE) || defined (__SYMBIAN32__) || defined(__GP32__) || defined(GP2X) || defined (__MAEMO__) || defined(__DS__) || defined (__MINT__) || defined(__N64__) +#if defined(_WIN32_WCE) || defined(__SYMBIAN32__) || defined(__GP32__) || defined(GP2X) || defined(__MAEMO__) || defined(__DS__) || defined(__MINT__) || defined(__N64__) #include "common/config-manager.h" #endif @@ -1226,7 +1226,7 @@ FM_OPL *makeAdLibOPL(int rate) { // We need to emulate one YM3812 chip int env_bits = FMOPL_ENV_BITS_HQ; int eg_ent = FMOPL_EG_ENT_HQ; -#if defined (_WIN32_WCE) || defined(__SYMBIAN32__) || defined(__GP32__) || defined (GP2X) || defined(__MAEMO__) || defined(__DS__) || defined (__MINT__) || defined(__N64__) +#if defined(_WIN32_WCE) || defined(__SYMBIAN32__) || defined(__GP32__) || defined(GP2X) || defined(__MAEMO__) || defined(__DS__) || defined(__MINT__) || defined(__N64__) if (ConfMan.hasKey("FM_high_quality") && ConfMan.getBool("FM_high_quality")) { env_bits = FMOPL_ENV_BITS_HQ; eg_ent = FMOPL_EG_ENT_HQ; |