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

[thebluegr at users.sourceforge.net]

Revision: 42289
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42289&view=rev
Author:   thebluegr
Date:     2009-07-09 15:15:49 +0000 (Thu, 09 Jul 2009)

Log Message:
-----------
Reverted commit #42257, as the original issue was with the compilation process of MSVC and the ENABLE_* checks work correctly

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-09 15:12:35 UTC (rev 42288)
+++ scummvm/trunk/graphics/sjis.cpp	2009-07-09 15:15:49 UTC (rev 42289)
@@ -23,16 +23,11 @@
  */
 
 #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 {
 
 bool FontTowns::loadFromStream(Common::ReadStream &stream) {
@@ -198,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-09 15:12:35 UTC (rev 42288)
+++ scummvm/trunk/graphics/sjis.h	2009-07-09 15:15:49 UTC (rev 42289)
@@ -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 @@
 
 #endif
 
+#endif // defined(ENABLE_KYRA) || defined(ENABLE_SCI)
+


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