[Scummvm-git-logs] scummvm master -> a194d93ca0571782ac5b74e336e3b81321880e1a

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a194d93ca0 BLADERUNNER: Fix Usage of Original Bugs Macro Define


Commit: a194d93ca0571782ac5b74e336e3b81321880e1a
    https://github.com/scummvm/scummvm/commit/a194d93ca0571782ac5b74e336e3b81321880e1a
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-14T22:04:35Z

Commit Message:
BLADERUNNER: Fix Usage of Original Bugs Macro Define

This was not previously taking effect as the defining header was not
included in all used locations.

This causes GCC compiler warnings when -Wundef was passed.

Changed paths:
    engines/bladerunner/audio_mixer.h
    engines/bladerunner/audio_player.h
    engines/bladerunner/debugger.h
    engines/bladerunner/music.h
    engines/bladerunner/screen_effects.cpp
    engines/bladerunner/screen_effects.h
    engines/bladerunner/set.h


diff --git a/engines/bladerunner/audio_mixer.h b/engines/bladerunner/audio_mixer.h
index 58feb391d11..08637557035 100644
--- a/engines/bladerunner/audio_mixer.h
+++ b/engines/bladerunner/audio_mixer.h
@@ -27,6 +27,8 @@
 
 #include "common/mutex.h"
 
+#include "bladerunner/bladerunner.h" // For BLADERUNNER_ORIGINAL_BUGS symbol
+
 namespace BladeRunner {
 
 class BladeRunnerEngine;
diff --git a/engines/bladerunner/audio_player.h b/engines/bladerunner/audio_player.h
index 748ba26864d..b0ec5ad6d54 100644
--- a/engines/bladerunner/audio_player.h
+++ b/engines/bladerunner/audio_player.h
@@ -29,6 +29,8 @@
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
 
+#include "bladerunner/bladerunner.h" // For BLADERUNNER_ORIGINAL_BUGS symbol
+
 namespace BladeRunner {
 
 class BladeRunnerEngine;
diff --git a/engines/bladerunner/debugger.h b/engines/bladerunner/debugger.h
index 111e2f94cee..36939a56373 100644
--- a/engines/bladerunner/debugger.h
+++ b/engines/bladerunner/debugger.h
@@ -22,6 +22,8 @@
 #ifndef BLADERUNNER_DEBUGGER_H
 #define BLADERUNNER_DEBUGGER_H
 
+#include "bladerunner/bladerunner.h" // For BLADERUNNER_ORIGINAL_BUGS symbol
+
 #include "bladerunner/vector.h"
 
 #include "gui/debugger.h"
diff --git a/engines/bladerunner/music.h b/engines/bladerunner/music.h
index 66907e5c1a8..8ea6c0bdf66 100644
--- a/engines/bladerunner/music.h
+++ b/engines/bladerunner/music.h
@@ -25,6 +25,8 @@
 #include "common/mutex.h"
 #include "common/str.h"
 
+#include "bladerunner/bladerunner.h" // For BLADERUNNER_ORIGINAL_BUGS symbol
+
 namespace BladeRunner {
 
 class AudStream;
diff --git a/engines/bladerunner/screen_effects.cpp b/engines/bladerunner/screen_effects.cpp
index bcbeb595d5f..d603bcb9555 100644
--- a/engines/bladerunner/screen_effects.cpp
+++ b/engines/bladerunner/screen_effects.cpp
@@ -19,6 +19,8 @@
  *
  */
 
+#include "bladerunner/bladerunner.h" // For BLADERUNNER_ORIGINAL_BUGS symbol
+
 #include "bladerunner/screen_effects.h"
 
 #include "common/stream.h"
diff --git a/engines/bladerunner/screen_effects.h b/engines/bladerunner/screen_effects.h
index 93a08f614f7..eff99493b37 100644
--- a/engines/bladerunner/screen_effects.h
+++ b/engines/bladerunner/screen_effects.h
@@ -22,6 +22,8 @@
 #ifndef BLADERUNNER_SCREEN_EFFECTS_H
 #define BLADERUNNER_SCREEN_EFFECTS_H
 
+#include "bladerunner/bladerunner.h" // For BLADERUNNER_ORIGINAL_BUGS symbol
+
 #include "bladerunner/color.h"
 
 #include "common/array.h"
diff --git a/engines/bladerunner/set.h b/engines/bladerunner/set.h
index 0044ef186f3..649b4329957 100644
--- a/engines/bladerunner/set.h
+++ b/engines/bladerunner/set.h
@@ -22,6 +22,8 @@
 #ifndef BLADERUNNER_SET_H
 #define BLADERUNNER_SET_H
 
+#include "bladerunner/bladerunner.h" // For BLADERUNNER_ORIGINAL_BUGS symbol
+
 #include "bladerunner/boundingbox.h"
 
 #include "common/scummsys.h"