aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/imuse
diff options
context:
space:
mode:
authorTorbjörn Andersson2007-02-19 17:48:19 +0000
committerTorbjörn Andersson2007-02-19 17:48:19 +0000
commita1a16d1579f3192f430627b62d7d181ee92d6c4d (patch)
treed69a4c903789f0af21308ceff7c973f3ef3666a8 /engines/scumm/imuse
parent09ad4f1a87d25f82fed50b575adc4fa419aa1c7c (diff)
downloadscummvm-rg350-a1a16d1579f3192f430627b62d7d181ee92d6c4d.tar.gz
scummvm-rg350-a1a16d1579f3192f430627b62d7d181ee92d6c4d.tar.bz2
scummvm-rg350-a1a16d1579f3192f430627b62d7d181ee92d6c4d.zip
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
Diffstat (limited to 'engines/scumm/imuse')
-rw-r--r--engines/scumm/imuse/imuse.h4
-rw-r--r--engines/scumm/imuse/imuse_internal.h4
-rw-r--r--engines/scumm/imuse/instrument.h4
-rw-r--r--engines/scumm/imuse/sysex.h4
4 files changed, 8 insertions, 8 deletions
diff --git a/engines/scumm/imuse/imuse.h b/engines/scumm/imuse/imuse.h
index a82d82cca7..fe779a1360 100644
--- a/engines/scumm/imuse/imuse.h
+++ b/engines/scumm/imuse/imuse.h
@@ -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"
diff --git a/engines/scumm/imuse/imuse_internal.h b/engines/scumm/imuse/imuse_internal.h
index 40035fb053..1a70563c8f 100644
--- a/engines/scumm/imuse/imuse_internal.h
+++ b/engines/scumm/imuse/imuse_internal.h
@@ -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"
diff --git a/engines/scumm/imuse/instrument.h b/engines/scumm/imuse/instrument.h
index 960c887534..98e4a6cbad 100644
--- a/engines/scumm/imuse/instrument.h
+++ b/engines/scumm/imuse/instrument.h
@@ -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"
diff --git a/engines/scumm/imuse/sysex.h b/engines/scumm/imuse/sysex.h
index ba16282a2c..b573906887 100644
--- a/engines/scumm/imuse/sysex.h
+++ b/engines/scumm/imuse/sysex.h
@@ -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"