aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2013-10-27 22:45:07 +0200
committerEugene Sandulenko2013-10-27 22:45:49 +0200
commit874939ae893498e36f135052b187f7d65792d7c4 (patch)
tree8a194cecb7087b2114be687a2b243d71d3ee53a5
parentc8b34eb8175d78d52431593ff84c696a4bd29123 (diff)
downloadscummvm-rg350-874939ae893498e36f135052b187f7d65792d7c4.tar.gz
scummvm-rg350-874939ae893498e36f135052b187f7d65792d7c4.tar.bz2
scummvm-rg350-874939ae893498e36f135052b187f7d65792d7c4.zip
COMMON: Make XCode 5.0.1 happier
-rw-r--r--common/c++11-compat.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/c++11-compat.h b/common/c++11-compat.h
index 50d79bd79e..f963ba9ac8 100644
--- a/common/c++11-compat.h
+++ b/common/c++11-compat.h
@@ -31,7 +31,9 @@
// Custom nullptr replacement. This is not type safe as the real C++11 nullptr
// though.
//
+#if !defined(nullptr) // XCode 5.0.1 has __cplusplus=199711 but defines this
#define nullptr 0
+#endif
//
// Replacement for the override keyword. This allows compilation of code