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

8 files changed, 16 insertions, 16 deletions

diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h
index bb847fdef6..78b0a747e0 100644
--- a/engines/scumm/he/animation_he.h
+++ b/engines/scumm/he/animation_he.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef ANIMATION_H
-#define ANIMATION_H
+#ifndef SCUMM_HE_ANIMATION_H
+#define SCUMM_HE_ANIMATION_H
 
 #include "common/file.h"
 
diff --git a/engines/scumm/he/cup_player_he.h b/engines/scumm/he/cup_player_he.h
index 317a371a0e..1295cec7a1 100644
--- a/engines/scumm/he/cup_player_he.h
+++ b/engines/scumm/he/cup_player_he.h
@@ -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"
 
diff --git a/engines/scumm/he/floodfill_he.h b/engines/scumm/he/floodfill_he.h
index 7d0fa7073f..6369e4712e 100644
--- a/engines/scumm/he/floodfill_he.h
+++ b/engines/scumm/he/floodfill_he.h
@@ -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"
 
diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index bb22e04a1d..7cc172dcd7 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -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
diff --git a/engines/scumm/he/logic_he.h b/engines/scumm/he/logic_he.h
index 59476f2e3b..42dc9b0e08 100644
--- a/engines/scumm/he/logic_he.h
+++ b/engines/scumm/he/logic_he.h
@@ -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"
 
diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h
index d6bd09253d..c287108abc 100644
--- a/engines/scumm/he/resource_he.h
+++ b/engines/scumm/he/resource_he.h
@@ -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 {
 
diff --git a/engines/scumm/he/sprite_he.h b/engines/scumm/he/sprite_he.h
index 5396c1fed4..d7fbbe2f63 100644
--- a/engines/scumm/he/sprite_he.h
+++ b/engines/scumm/he/sprite_he.h
@@ -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 {
 
diff --git a/engines/scumm/he/wiz_he.h b/engines/scumm/he/wiz_he.h
index bbb0fc50bb..95a69c517e 100644
--- a/engines/scumm/he/wiz_he.h
+++ b/engines/scumm/he/wiz_he.h
@@ -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"