aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorEugene Sandulenko2019-09-23 22:17:49 +0200
committerEugene Sandulenko2019-09-23 22:22:23 +0200
commit7def18a26ca0ddb383fcb3b126d6a7934fa2ae57 (patch)
tree8a4b4eca80bebdbf2fd7ac9cc98a33b18973f6f6 /common
parent64cf3b6e9b9f54ae643e9b3aa6d1db249f53d3bc (diff)
downloadscummvm-rg350-7def18a26ca0ddb383fcb3b126d6a7934fa2ae57.tar.gz
scummvm-rg350-7def18a26ca0ddb383fcb3b126d6a7934fa2ae57.tar.bz2
scummvm-rg350-7def18a26ca0ddb383fcb3b126d6a7934fa2ae57.zip
COMMON: Workaround for a compiler bug in osx_intel buildbot toolchain
It was introduced in 014bef9eab9fb409cfb3ec66830e033e4aaa29a9. There is nothing wrong with our code, but strangely, it makes the i686-apple-darwin9-as v1.38 to choke when parsing .stabd directives. Once we upgrade buildbot or do another change to system.h, hopefully this could be removed.
Diffstat (limited to 'common')
-rw-r--r--common/system.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/common/system.h b/common/system.h
index ae0575f0e8..30c2ea9d63 100644
--- a/common/system.h
+++ b/common/system.h
@@ -222,6 +222,10 @@ protected:
*/
Common::String _clipboard;
+ // WORKAROUND. The 014bef9eab9fb409cfb3ec66830e033e4aaa29a9 triggered a bug
+ // in the osx_intel toolchain. Adding this variable fixes it.
+ bool _dummyUnused;
+
private:
/**
* Indicate if initBackend() has been called.
@@ -1524,7 +1528,7 @@ public:
virtual bool isConnectionLimited();
//@}
-
+
protected:
/**