diff options
| -rw-r--r-- | graphics/sjis.cpp | 13 | ||||
| -rw-r--r-- | graphics/sjis.h | 10 |
2 files changed, 9 insertions, 14 deletions
diff --git a/graphics/sjis.cpp b/graphics/sjis.cpp index 5392a1c9a4..95736cf401 100644 --- a/graphics/sjis.cpp +++ b/graphics/sjis.cpp @@ -23,11 +23,16 @@ */ #include "graphics/sjis.h" - -#ifdef GRAPHICS_SJIS_H - #include "common/debug.h" +// The code in this file is currently only used in KYRA and SCI. +// So if neither of those is enabled, we will skip compiling it. +// If you plan to use this code in another engine, you will have +// to add the proper define check here. +// Also please add the define check at the comment after the +// matching #endif further down this file. +#if defined(ENABLE_KYRA) || defined(ENABLE_SCI) + namespace Graphics { bool FontTowns::loadFromStream(Common::ReadStream &stream) { @@ -193,5 +198,5 @@ uint FontTowns::sjisToChunk(uint8 f, uint8 s) { } // end of namespace Graphics -#endif // defined(GRAPHICS_SJIS_H) +#endif // defined(ENABLE_KYRA) || defined(ENABLE_SCI) diff --git a/graphics/sjis.h b/graphics/sjis.h index f7321742af..c7eeeed9f6 100644 --- a/graphics/sjis.h +++ b/graphics/sjis.h @@ -22,14 +22,6 @@ * $Id$ */ -// The code in this file is currently only used in KYRA and SCI. -// So if neither of those is enabled, we will skip compiling it. -// If you plan to use this code in another engine, you will have -// to add the proper define check here. -// Also please add the define check at the comment after the -// matching #endif further down this file. -#if defined(ENABLE_KYRA) || defined(ENABLE_SCI) - #ifndef GRAPHICS_SJIS_H #define GRAPHICS_SJIS_H @@ -131,5 +123,3 @@ private: #endif -#endif // defined(ENABLE_KYRA) || defined(ENABLE_SCI) - |