[Scummvm-cvs-logs] SF.net SVN: scummvm: [25727] scummvm/trunk/engines/scumm

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Mon Feb 19 18:48:21 CET 2007


Revision: 25727
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25727&view=rev
Author:   eriktorbjorn
Date:     2007-02-19 09:48:19 -0800 (Mon, 19 Feb 2007)

Log Message:
-----------
Use consistent naming for the preprocessor constants used to guarantee that
header files are only included once. Many of them didn't have a SCUMM prefix
which could have lead to clashes with common header files.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/actor.h
    scummvm/trunk/engines/scumm/akos.h
    scummvm/trunk/engines/scumm/base-costume.h
    scummvm/trunk/engines/scumm/bomp.h
    scummvm/trunk/engines/scumm/boxes.h
    scummvm/trunk/engines/scumm/charset.h
    scummvm/trunk/engines/scumm/costume.h
    scummvm/trunk/engines/scumm/gfx.h
    scummvm/trunk/engines/scumm/he/animation_he.h
    scummvm/trunk/engines/scumm/he/cup_player_he.h
    scummvm/trunk/engines/scumm/he/floodfill_he.h
    scummvm/trunk/engines/scumm/he/intern_he.h
    scummvm/trunk/engines/scumm/he/logic_he.h
    scummvm/trunk/engines/scumm/he/resource_he.h
    scummvm/trunk/engines/scumm/he/sprite_he.h
    scummvm/trunk/engines/scumm/he/wiz_he.h
    scummvm/trunk/engines/scumm/imuse/imuse.h
    scummvm/trunk/engines/scumm/imuse/imuse_internal.h
    scummvm/trunk/engines/scumm/imuse/instrument.h
    scummvm/trunk/engines/scumm/imuse/sysex.h
    scummvm/trunk/engines/scumm/imuse_digi/dimuse.h
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.h
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.h
    scummvm/trunk/engines/scumm/insane/insane.h
    scummvm/trunk/engines/scumm/nut_renderer.h
    scummvm/trunk/engines/scumm/object.h
    scummvm/trunk/engines/scumm/player_mod.h
    scummvm/trunk/engines/scumm/player_nes.h
    scummvm/trunk/engines/scumm/player_v1.h
    scummvm/trunk/engines/scumm/player_v2.h
    scummvm/trunk/engines/scumm/player_v2a.h
    scummvm/trunk/engines/scumm/player_v3a.h
    scummvm/trunk/engines/scumm/resource.h
    scummvm/trunk/engines/scumm/saveload.h
    scummvm/trunk/engines/scumm/script.h
    scummvm/trunk/engines/scumm/smush/channel.h
    scummvm/trunk/engines/scumm/smush/chunk.h
    scummvm/trunk/engines/scumm/smush/codec37.h
    scummvm/trunk/engines/scumm/smush/codec47.h
    scummvm/trunk/engines/scumm/smush/smush_font.h
    scummvm/trunk/engines/scumm/smush/smush_mixer.h
    scummvm/trunk/engines/scumm/smush/smush_player.h
    scummvm/trunk/engines/scumm/usage_bits.h
    scummvm/trunk/engines/scumm/verbs.h

Modified: scummvm/trunk/engines/scumm/actor.h
===================================================================
--- scummvm/trunk/engines/scumm/actor.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/actor.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef ACTOR_H
-#define ACTOR_H
+#ifndef SCUMM_ACTOR_H
+#define SCUMM_ACTOR_H
 
 #include "common/scummsys.h"
 #include "scumm/saveload.h"

Modified: scummvm/trunk/engines/scumm/akos.h
===================================================================
--- scummvm/trunk/engines/scumm/akos.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/akos.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef AKOS_H
-#define AKOS_H
+#ifndef SCUMM_AKOS_H
+#define SCUMM_AKOS_H
 
 #include "scumm/base-costume.h"
 

Modified: scummvm/trunk/engines/scumm/base-costume.h
===================================================================
--- scummvm/trunk/engines/scumm/base-costume.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/base-costume.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef BASE_COSTUME_H
-#define BASE_COSTUME_H
+#ifndef SCUMM_BASE_COSTUME_H
+#define SCUMM_BASE_COSTUME_H
 
 #include "common/scummsys.h"
 #include "scumm/actor.h"		// for CostumeData

Modified: scummvm/trunk/engines/scumm/bomp.h
===================================================================
--- scummvm/trunk/engines/scumm/bomp.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/bomp.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BOMP_H
-#define BOMP_H
+#ifndef SCUMM_BOMP_H
+#define SCUMM_BOMP_H
 
 #include "common/scummsys.h"
 

Modified: scummvm/trunk/engines/scumm/boxes.h
===================================================================
--- scummvm/trunk/engines/scumm/boxes.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/boxes.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef BOXES_H
-#define BOXES_H
+#ifndef SCUMM_BOXES_H
+#define SCUMM_BOXES_H
 
 #include "common/rect.h"
 

Modified: scummvm/trunk/engines/scumm/charset.h
===================================================================
--- scummvm/trunk/engines/scumm/charset.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/charset.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef CHARSET_H
-#define CHARSET_H
+#ifndef SCUMM_CHARSET_H
+#define SCUMM_CHARSET_H
 
 #include "common/scummsys.h"
 #include "common/rect.h"

Modified: scummvm/trunk/engines/scumm/costume.h
===================================================================
--- scummvm/trunk/engines/scumm/costume.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/costume.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef COSTUME_H
-#define COSTUME_H
+#ifndef SCUMM_COSTUME_H
+#define SCUMM_COSTUME_H
 
 #include "scumm/base-costume.h"
 

Modified: scummvm/trunk/engines/scumm/gfx.h
===================================================================
--- scummvm/trunk/engines/scumm/gfx.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/gfx.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef GFX_H
-#define GFX_H
+#ifndef SCUMM_GFX_H
+#define SCUMM_GFX_H
 
 #include "graphics/surface.h"
 

Modified: scummvm/trunk/engines/scumm/he/animation_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/animation_he.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/he/animation_he.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef ANIMATION_H
-#define ANIMATION_H
+#ifndef SCUMM_HE_ANIMATION_H
+#define SCUMM_HE_ANIMATION_H
 
 #include "common/file.h"
 

Modified: scummvm/trunk/engines/scumm/he/cup_player_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/cup_player_he.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/he/cup_player_he.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  */
 
 
-#if !defined(CUP_PLAYER_HE_H) && !defined(DISABLE_HE)
-#define CUP_PLAYER_HE_H
+#if !defined(SCUMM_HE_CUP_PLAYER_HE_H) && !defined(DISABLE_HE)
+#define SCUMM_HE_CUP_PLAYER_HE_H
 
 #include "common/stream.h"
 

Modified: scummvm/trunk/engines/scumm/he/floodfill_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/floodfill_he.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/he/floodfill_he.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#if !defined(FLOODFILL_HE_H) && !defined(DISABLE_HE)
-#define FLOODFILL_HE_H
+#if !defined(SCUMM_HE_FLOODFILL_HE_H) && !defined(DISABLE_HE)
+#define SCUMM_HE_FLOODFILL_HE_H
 
 #include "common/rect.h"
 

Modified: scummvm/trunk/engines/scumm/he/intern_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/intern_he.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/he/intern_he.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SCUMM_INTERN_HE_H
-#define SCUMM_INTERN_HE_H
+#ifndef SCUMM_HE_INTERN_HE_H
+#define SCUMM_HE_INTERN_HE_H
 
 #include "scumm/intern.h"
 #ifndef DISABLE_HE

Modified: scummvm/trunk/engines/scumm/he/logic_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/logic_he.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/he/logic_he.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -20,8 +20,8 @@
  *
  */
 
-#if !defined(LOGIC_HE_H) && !defined(DISABLE_HE)
-#define LOGIC_HE_H
+#if !defined(SCUMM_HE_LOGIC_HE_H) && !defined(DISABLE_HE)
+#define SCUMM_HE_LOGIC_HE_H
 
 #include "common/stdafx.h"
 

Modified: scummvm/trunk/engines/scumm/he/resource_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/resource_he.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/he/resource_he.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -24,8 +24,8 @@
  *
  */
 
-#if !defined(RESOURCE_HE_H) && !defined(DISABLE_HE)
-#define RESOURCE_HE_H
+#if !defined(SCUMM_HE_RESOURCE_HE_H) && !defined(DISABLE_HE)
+#define SCUMM_HE_RESOURCE_HE_H
 
 namespace Scumm {
 

Modified: scummvm/trunk/engines/scumm/he/sprite_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/sprite_he.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/he/sprite_he.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#if !defined(SPRITE_HE_H) && !defined(DISABLE_HE)
-#define SPRITE_HE_H
+#if !defined(SCUMM_HE_SPRITE_HE_H) && !defined(DISABLE_HE)
+#define SCUMM_HE_SPRITE_HE_H
 
 namespace Scumm {
 

Modified: scummvm/trunk/engines/scumm/he/wiz_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/wiz_he.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/he/wiz_he.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#if !defined(WIZ_HE_H) && !defined(DISABLE_HE)
-#define WIZ_HE_H
+#if !defined(SCUMM_HE_WIZ_HE_H) && !defined(DISABLE_HE)
+#define SCUMM_HE_WIZ_HE_H
 
 #include "common/rect.h"
 

Modified: scummvm/trunk/engines/scumm/imuse/imuse.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse/imuse.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/imuse/imuse.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef IMUSE_H
-#define IMUSE_H
+#ifndef SCUMM_IMUSE_H
+#define SCUMM_IMUSE_H
 
 #include "common/scummsys.h"
 #include "common/mutex.h"

Modified: scummvm/trunk/engines/scumm/imuse/imuse_internal.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse/imuse_internal.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/imuse/imuse_internal.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -20,8 +20,8 @@
  * $Id$
  */
 
-#ifndef DEFINED_IMUSE_INTERNAL
-#define DEFINED_IMUSE_INTERNAL
+#ifndef SCUMM_IMUSE_INTERNAL
+#define SCUMM_IMUSE_INTERNAL
 
 #include "common/scummsys.h"
 #include "scumm/imuse/imuse.h"

Modified: scummvm/trunk/engines/scumm/imuse/instrument.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse/instrument.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/imuse/instrument.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -20,8 +20,8 @@
  * $Id$
  */
 
-#ifndef INSTRUMENT_H
-#define INSTRUMENT_H
+#ifndef SCUMM_IMUSE_INSTRUMENT_H
+#define SCUMM_IMUSE_INSTRUMENT_H
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"

Modified: scummvm/trunk/engines/scumm/imuse/sysex.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse/sysex.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/imuse/sysex.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -20,8 +20,8 @@
  * $Id$
  */
 
-#ifndef DEFINED_SYSEX_H
-#define DEFINED_SYSEX_H
+#ifndef SCUMM_IMUSE_SYSEX_H
+#define SCUMM_IMUSE_SYSEX_H
 
 #include "common/stdafx.h"
 #include "common/util.h"

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(IMUSE_DIGI_H) && !defined(DISABLE_SCUMM_7_8)
-#define IMUSE_DIGI_H
+#if !defined(SCUMM_IMUSE_DIGI_H) && !defined(DISABLE_SCUMM_7_8)
+#define SCUMM_IMUSE_DIGI_H
 
 #include "common/scummsys.h"
 #include "common/util.h"

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef BUNDLE_MGR_H
-#define BUNDLE_MGR_H
+#ifndef SCUMM_IMUSE_DIGI_BUNDLE_MGR_H
+#define SCUMM_IMUSE_DIGI_BUNDLE_MGR_H
 
 #include "common/scummsys.h"
 #include "common/file.h"

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef IMUSE_DIGI_SNDMGR_H
-#define IMUSE_DIGI_SNDMGR_H
+#ifndef SCUMM_IMUSE_DIGI_SNDMGR_H
+#define SCUMM_IMUSE_DIGI_SNDMGR_H
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"

Modified: scummvm/trunk/engines/scumm/insane/insane.h
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/insane/insane.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -20,8 +20,8 @@
  *
  */
 
-#if !defined(INSANE_H) && !defined(DISABLE_SCUMM_7_8)
-#define INSANE_H
+#if !defined(SCUMM_INSANE_H) && !defined(DISABLE_SCUMM_7_8)
+#define SCUMM_INSANE_H
 
 #include "engines/engine.h"
 #include "scumm/intern.h"

Modified: scummvm/trunk/engines/scumm/nut_renderer.h
===================================================================
--- scummvm/trunk/engines/scumm/nut_renderer.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/nut_renderer.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(NUT_RENDERER_H) && !defined(DISABLE_SCUMM_7_8)
-#define NUT_RENDERER_H
+#if !defined(SCUMM_NUT_RENDERER_H) && !defined(DISABLE_SCUMM_7_8)
+#define SCUMM_NUT_RENDERER_H
 
 #include "common/file.h"
 #include "graphics/surface.h"

Modified: scummvm/trunk/engines/scumm/object.h
===================================================================
--- scummvm/trunk/engines/scumm/object.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/object.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef OBJECT_H
-#define OBJECT_H
+#ifndef SCUMM_OBJECT_H
+#define SCUMM_OBJECT_H
 
 namespace Scumm {
 

Modified: scummvm/trunk/engines/scumm/player_mod.h
===================================================================
--- scummvm/trunk/engines/scumm/player_mod.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/player_mod.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef PLAYER_MOD_H
-#define PLAYER_MOD_H
+#ifndef SCUMM_PLAYER_MOD_H
+#define SCUMM_PLAYER_MOD_H
 
 #include "scumm/scumm.h"
 #include "sound/audiostream.h"

Modified: scummvm/trunk/engines/scumm/player_nes.h
===================================================================
--- scummvm/trunk/engines/scumm/player_nes.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/player_nes.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef PLAYER_NES_H
-#define PLAYER_NES_H
+#ifndef SCUMM_PLAYER_NES_H
+#define SCUMM_PLAYER_NES_H
 
 #include "common/scummsys.h"
 #include "scumm/music.h"

Modified: scummvm/trunk/engines/scumm/player_v1.h
===================================================================
--- scummvm/trunk/engines/scumm/player_v1.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/player_v1.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef PLAYER_V1_H
-#define PLAYER_V1_H
+#ifndef SCUMM_PLAYER_V1_H
+#define SCUMM_PLAYER_V1_H
 
 #include "scumm/player_v2.h"
 

Modified: scummvm/trunk/engines/scumm/player_v2.h
===================================================================
--- scummvm/trunk/engines/scumm/player_v2.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/player_v2.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef PLAYER_V2_H
-#define PLAYER_V2_H
+#ifndef SCUMM_PLAYER_V2_H
+#define SCUMM_PLAYER_V2_H
 
 #include "common/scummsys.h"
 #include "common/mutex.h"

Modified: scummvm/trunk/engines/scumm/player_v2a.h
===================================================================
--- scummvm/trunk/engines/scumm/player_v2a.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/player_v2a.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef PLAYER_V2A_H
-#define PLAYER_V2A_H
+#ifndef SCUMM_PLAYER_V2A_H
+#define SCUMM_PLAYER_V2A_H
 
 #include "common/scummsys.h"
 #include "scumm/music.h"

Modified: scummvm/trunk/engines/scumm/player_v3a.h
===================================================================
--- scummvm/trunk/engines/scumm/player_v3a.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/player_v3a.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef PLAYER_V3A_H
-#define PLAYER_V3A_H
+#ifndef SCUMM_PLAYER_V3A_H
+#define SCUMM_PLAYER_V3A_H
 
 #include "common/scummsys.h"
 #include "scumm/music.h"

Modified: scummvm/trunk/engines/scumm/resource.h
===================================================================
--- scummvm/trunk/engines/scumm/resource.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/resource.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef RESOURCE_H
-#define RESOURCE_H
+#ifndef SCUMM_RESOURCE_H
+#define SCUMM_RESOURCE_H
 
 namespace Scumm {
 

Modified: scummvm/trunk/engines/scumm/saveload.h
===================================================================
--- scummvm/trunk/engines/scumm/saveload.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/saveload.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SAVELOAD_H
-#define SAVELOAD_H
+#ifndef SCUMM_SAVELOAD_H
+#define SCUMM_SAVELOAD_H
 
 #include "common/scummsys.h"
 #include <stddef.h>

Modified: scummvm/trunk/engines/scumm/script.h
===================================================================
--- scummvm/trunk/engines/scumm/script.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/script.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SCRIPT_H
-#define SCRIPT_H
+#ifndef SCUMM_SCRIPT_H
+#define SCUMM_SCRIPT_H
 
 #include "engines/engine.h"
 

Modified: scummvm/trunk/engines/scumm/smush/channel.h
===================================================================
--- scummvm/trunk/engines/scumm/smush/channel.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/smush/channel.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SMUSH_CHANNEL_H
-#define SMUSH_CHANNEL_H
+#ifndef SCUMM_SMUSH_CHANNEL_H
+#define SCUMM_SMUSH_CHANNEL_H
 
 #include "common/util.h"
 

Modified: scummvm/trunk/engines/scumm/smush/chunk.h
===================================================================
--- scummvm/trunk/engines/scumm/smush/chunk.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/smush/chunk.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef CHUNK_H
-#define CHUNK_H
+#ifndef SCUMM_SMUSH_CHUNK_H
+#define SCUMM_SMUSH_CHUNK_H
 
 #include "common/scummsys.h"
 #include "common/str.h"

Modified: scummvm/trunk/engines/scumm/smush/codec37.h
===================================================================
--- scummvm/trunk/engines/scumm/smush/codec37.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/smush/codec37.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SMUSH_CODEC37_H
-#define SMUSH_CODEC37_H
+#ifndef SCUMM_SMUSH_CODEC37_H
+#define SCUMM_SMUSH_CODEC37_H
 
 #include "common/scummsys.h"
 

Modified: scummvm/trunk/engines/scumm/smush/codec47.h
===================================================================
--- scummvm/trunk/engines/scumm/smush/codec47.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/smush/codec47.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SMUSH_CODEC_47_H
-#define SMUSH_CODEC_47_H
+#ifndef SCUMM_SMUSH_CODEC_47_H
+#define SCUMM_SMUSH_CODEC_47_H
 
 #include "common/scummsys.h"
 

Modified: scummvm/trunk/engines/scumm/smush/smush_font.h
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_font.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/smush/smush_font.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SMUSH_FONT_H
-#define SMUSH_FONT_H
+#ifndef SCUMM_SMUSH_FONT_H
+#define SCUMM_SMUSH_FONT_H
 
 #include "common/scummsys.h"
 #include "scumm/nut_renderer.h"

Modified: scummvm/trunk/engines/scumm/smush/smush_mixer.h
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_mixer.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/smush/smush_mixer.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SMUSH_MIXER_H
-#define SMUSH_MIXER_H
+#ifndef SCUMM_SMUSH_MIXER_H
+#define SCUMM_SMUSH_MIXER_H
 
 #include "common/stdafx.h"
 #include "scumm/sound.h"

Modified: scummvm/trunk/engines/scumm/smush/smush_player.h
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/smush/smush_player.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -20,8 +20,8 @@
  *
  */
 
-#if !defined(SMUSH_PLAYER_H) && !defined(DISABLE_SCUMM_7_8)
-#define SMUSH_PLAYER_H
+#if !defined(SCUMM_SMUSH_PLAYER_H) && !defined(DISABLE_SCUMM_7_8)
+#define SCUMM_SMUSH_PLAYER_H
 
 #include "common/util.h"
 #include "scumm/smush/chunk.h"

Modified: scummvm/trunk/engines/scumm/usage_bits.h
===================================================================
--- scummvm/trunk/engines/scumm/usage_bits.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/usage_bits.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef USAGE_BITS_H
-#define USAGE_BITS_H
+#ifndef SCUMM_USAGE_BITS_H
+#define SCUMM_USAGE_BITS_H
 
 namespace Scumm {
 

Modified: scummvm/trunk/engines/scumm/verbs.h
===================================================================
--- scummvm/trunk/engines/scumm/verbs.h	2007-02-19 17:30:43 UTC (rev 25726)
+++ scummvm/trunk/engines/scumm/verbs.h	2007-02-19 17:48:19 UTC (rev 25727)
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef VERBS_H
-#define VERBS_H
+#ifndef SCUMM_VERBS_H
+#define SCUMM_VERBS_H
 
 #include "common/scummsys.h"
 #include "common/rect.h"


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




More information about the Scummvm-git-logs mailing list