[Scummvm-git-logs] scummvm master -> 914bb1bd2d7f98cae87e7c2167f8f0e72ccfe86c

[csnover]

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:
914bb1bd2d COMMON: Undefine ABS if it is a macro


Commit: 914bb1bd2d7f98cae87e7c2167f8f0e72ccfe86c
    https://github.com/scummvm/scummvm/commit/914bb1bd2d7f98cae87e7c2167f8f0e72ccfe86c
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-10-07T13:04:05-05:00

Commit Message:
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.

Changed paths:
    common/util.h


diff --git a/common/util.h b/common/util.h
index 13c364e..a098a6a 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