aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorColin Snover2017-10-07 12:59:47 -0500
committerColin Snover2017-10-07 13:04:05 -0500
commit914bb1bd2d7f98cae87e7c2167f8f0e72ccfe86c (patch)
treec399bc9de889fd3d82e0d1a317340f1e1381f1af /common
parenta475295ccc3705c44374cc99b39fc09da3c99173 (diff)
downloadscummvm-rg350-914bb1bd2d7f98cae87e7c2167f8f0e72ccfe86c.tar.gz
scummvm-rg350-914bb1bd2d7f98cae87e7c2167f8f0e72ccfe86c.tar.bz2
scummvm-rg350-914bb1bd2d7f98cae87e7c2167f8f0e72ccfe86c.zip
COMMON: Undefine ABS if it is a macro
Fixes iOS7 compilation when common/util.h is included after NSObjCRuntime.h, as happens in ios7_video.mm.
Diffstat (limited to 'common')
-rw-r--r--common/util.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/common/util.h b/common/util.h
index 13c364e97d..a098a6a437 100644
--- a/common/util.h
+++ b/common/util.h
@@ -33,6 +33,9 @@
#define IS_ALIGNED(value, alignment) \
((((size_t)value) & ((alignment) - 1)) == 0)
+#ifdef ABS
+#undef ABS
+#endif
#ifdef MIN
#undef MIN