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.

svn-id: r25727

7 files changed, 14 insertions, 14 deletions

diff --git a/engines/scumm/smush/channel.h b/engines/scumm/smush/channel.h
index ff81996e6f..37b55030ea 100644
--- a/engines/scumm/smush/channel.h
+++ b/engines/scumm/smush/channel.h
@@ -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"
 
diff --git a/engines/scumm/smush/chunk.h b/engines/scumm/smush/chunk.h
index fbb0194fff..f88f9d37a2 100644
--- a/engines/scumm/smush/chunk.h
+++ b/engines/scumm/smush/chunk.h
@@ -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"
diff --git a/engines/scumm/smush/codec37.h b/engines/scumm/smush/codec37.h
index 10b371143d..6ad3e6b72e 100644
--- a/engines/scumm/smush/codec37.h
+++ b/engines/scumm/smush/codec37.h
@@ -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"
 
diff --git a/engines/scumm/smush/codec47.h b/engines/scumm/smush/codec47.h
index 017f518e7e..ccb4b4ccfd 100644
--- a/engines/scumm/smush/codec47.h
+++ b/engines/scumm/smush/codec47.h
@@ -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"
 
diff --git a/engines/scumm/smush/smush_font.h b/engines/scumm/smush/smush_font.h
index 65bee940c2..6e38f0b31f 100644
--- a/engines/scumm/smush/smush_font.h
+++ b/engines/scumm/smush/smush_font.h
@@ -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"
diff --git a/engines/scumm/smush/smush_mixer.h b/engines/scumm/smush/smush_mixer.h
index 05e33b6a8f..456c2b4203 100644
--- a/engines/scumm/smush/smush_mixer.h
+++ b/engines/scumm/smush/smush_mixer.h
@@ -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"
diff --git a/engines/scumm/smush/smush_player.h b/engines/scumm/smush/smush_player.h
index a10ddd2fd4..64240e5216 100644
--- a/engines/scumm/smush/smush_player.h
+++ b/engines/scumm/smush/smush_player.h
@@ -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"