Simply compile guard of SJIS code and fix comment.

svn-id: r42234

2 files changed, 8 insertions, 10 deletions

diff --git a/graphics/sjis.cpp b/graphics/sjis.cpp
index 7459c98f6c..5392a1c9a4 100644
--- a/graphics/sjis.cpp
+++ b/graphics/sjis.cpp
@@ -22,14 +22,10 @@
  * $Id$
  */
 
-// The code in this files is currently only used in KYRA and SCI.
-// So if no of those is enabled, we will not compile it.
-// If you plan to use this code in another engine, you will have
-// to add the proper defined check here and in sjis.h
-#if defined(ENABLE_KYRA) || defined(ENABLE_SCI)
-
 #include "graphics/sjis.h"
 
+#ifdef GRAPHICS_SJIS_H
+
 #include "common/debug.h"
 
 namespace Graphics {
@@ -197,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 ca5fc95004..f7321742af 100644
--- a/graphics/sjis.h
+++ b/graphics/sjis.h
@@ -22,10 +22,12 @@
  * $Id$
  */
 
-// The code in this files is currently only used in KYRA and SCI.
-// So if no of those is enabled, we will not compile it.
+// 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 defined check here and in sjis.cpp
+// 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