aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/parallaction/sound.h2
-rw-r--r--sound/iff_sound.cpp (renamed from sound/iff.cpp)2
-rw-r--r--sound/iff_sound.h (renamed from sound/iff.h)0
-rw-r--r--sound/module.mk2
4 files changed, 3 insertions, 3 deletions
diff --git a/engines/parallaction/sound.h b/engines/parallaction/sound.h
index 8fcfb94a9a..5a2c5e1c38 100644
--- a/engines/parallaction/sound.h
+++ b/engines/parallaction/sound.h
@@ -30,7 +30,7 @@
#include "common/mutex.h"
#include "sound/audiostream.h"
-#include "sound/iff.h"
+#include "sound/iff_sound.h"
#include "sound/mixer.h"
#include "sound/mididrv.h"
diff --git a/sound/iff.cpp b/sound/iff_sound.cpp
index 1df58b178c..60a1486ed5 100644
--- a/sound/iff.cpp
+++ b/sound/iff_sound.cpp
@@ -23,7 +23,7 @@
*
*/
-#include "sound/iff.h"
+#include "sound/iff_sound.h"
#include "sound/audiostream.h"
#include "sound/mixer.h"
#include "common/func.h"
diff --git a/sound/iff.h b/sound/iff_sound.h
index 82106cb75e..82106cb75e 100644
--- a/sound/iff.h
+++ b/sound/iff_sound.h
diff --git a/sound/module.mk b/sound/module.mk
index dba9501a38..3bcdd47c56 100644
--- a/sound/module.mk
+++ b/sound/module.mk
@@ -5,7 +5,7 @@ MODULE_OBJS := \
aiff.o \
audiocd.o \
audiostream.o \
- iff.o \
+ iff_sound.o \
flac.o \
fmopl.o \
mididrv.o \