aboutsummaryrefslogtreecommitdiffstats
path: root/testing/scummvm/disable-forbidden.patch
diff options
context:
space:
mode:
Diffstat (limited to 'testing/scummvm/disable-forbidden.patch')
-rw-r--r--testing/scummvm/disable-forbidden.patch22
1 files changed, 12 insertions, 10 deletions
diff --git a/testing/scummvm/disable-forbidden.patch b/testing/scummvm/disable-forbidden.patch
index 1d37efc279..c44d94b335 100644
--- a/testing/scummvm/disable-forbidden.patch
+++ b/testing/scummvm/disable-forbidden.patch
@@ -2,13 +2,15 @@ This patch fix compatibility between scummvm/forbidden security enforcement
and fortify-headers. The first is meant to avoid direct access to system
calls for scummvm to be fully portable on a lot of platforms.
---- a/common/scummsys.h
-+++ b/common/scummsys.h
-@@ -464,6 +464,4 @@
-
- #endif
-
--#include "common/forbidden.h"
--
- #endif
-
+--- a/common/forbidden.h
++++ b/common/forbidden.h
+@@ -39,6 +39,9 @@
+ * measure. Especially new code should avoid this at all costs.
+ */
+
++// Disable symbol overrides so that we can use system headers.
++#define FORBIDDEN_SYMBOL_ALLOW_ALL
++
+ #ifndef FORBIDDEN_SYMBOL_ALLOW_ALL
+
+ // Make sure scummsys.h is always included first