[Scummvm-cvs-logs] SF.net SVN: scummvm:[42234] scummvm/trunk/graphics

[lordhoto at users.sourceforge.net]

Revision: 42234
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42234&view=rev
Author:   lordhoto
Date:     2009-07-07 19:18:32 +0000 (Tue, 07 Jul 2009)

Log Message:
-----------
Simply compile guard of SJIS code and fix comment.

Modified Paths:
--------------
    scummvm/trunk/graphics/sjis.cpp
    scummvm/trunk/graphics/sjis.h

Modified: scummvm/trunk/graphics/sjis.cpp
===================================================================
--- scummvm/trunk/graphics/sjis.cpp	2009-07-07 19:00:51 UTC (rev 42233)
+++ scummvm/trunk/graphics/sjis.cpp	2009-07-07 19:18:32 UTC (rev 42234)
@@ -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 @@
 
 } // end of namespace Graphics
 
-#endif // defined(ENABLE_KYRA) || defined(ENABLE_SCI)
+#endif // defined(GRAPHICS_SJIS_H)
 

Modified: scummvm/trunk/graphics/sjis.h
===================================================================
--- scummvm/trunk/graphics/sjis.h	2009-07-07 19:00:51 UTC (rev 42233)
+++ scummvm/trunk/graphics/sjis.h	2009-07-07 19:18:32 UTC (rev 42234)
@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.