aboutsummaryrefslogtreecommitdiff
path: root/backends/audiocd
diff options
context:
space:
mode:
Diffstat (limited to 'backends/audiocd')
-rw-r--r--backends/audiocd/audiocd.h2
-rw-r--r--backends/audiocd/sdl/sdl-audiocd.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/backends/audiocd/audiocd.h b/backends/audiocd/audiocd.h
index 5ea5bfcfd4..f218db7f72 100644
--- a/backends/audiocd/audiocd.h
+++ b/backends/audiocd/audiocd.h
@@ -26,8 +26,8 @@
#ifndef BACKENDS_AUDIOCD_ABSTRACT_H
#define BACKENDS_AUDIOCD_ABSTRACT_H
-#include "common/noncopyable.h"
#include "common/scummsys.h"
+#include "common/noncopyable.h"
/**
* Abstract Audio CD manager class. Subclasses implement the actual
diff --git a/backends/audiocd/sdl/sdl-audiocd.cpp b/backends/audiocd/sdl/sdl-audiocd.cpp
index b906a3786f..62ab333f54 100644
--- a/backends/audiocd/sdl/sdl-audiocd.cpp
+++ b/backends/audiocd/sdl/sdl-audiocd.cpp
@@ -25,6 +25,9 @@
#if defined(SDL_BACKEND)
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
#include "backends/audiocd/sdl/sdl-audiocd.h"
SdlAudioCDManager::SdlAudioCDManager()