aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/sjis.cpp13
-rw-r--r--graphics/sjis.h10
2 files changed, 14 insertions, 9 deletions
diff --git a/graphics/sjis.cpp b/graphics/sjis.cpp
index 95736cf401..5392a1c9a4 100644
--- a/graphics/sjis.cpp
+++ b/graphics/sjis.cpp
@@ -23,15 +23,10 @@
*/
#include "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)
+#ifdef GRAPHICS_SJIS_H
+
+#include "common/debug.h"
namespace Graphics {
@@ -198,5 +193,5 @@ uint FontTowns::sjisToChunk(uint8 f, uint8 s) {
} // end of namespace Graphics
-#endif // defined(ENABLE_KYRA) || defined(ENABLE_SCI)
+#endif // defined(GRAPHICS_SJIS_H)
diff --git a/graphics/sjis.h b/graphics/sjis.h
index c7eeeed9f6..f7321742af 100644
--- a/graphics/sjis.h
+++ b/graphics/sjis.h
@@ -22,6 +22,14 @@
* $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
@@ -123,3 +131,5 @@ private:
#endif
+#endif // defined(ENABLE_KYRA) || defined(ENABLE_SCI)
+