From e3a435add25b991a54287b6de897cbcf6f1fbb1d Mon Sep 17 00:00:00 2001
From: Franz Detro <franz.detro@native-instruments.de>
Date: Wed, 26 Feb 2014 08:59:58 +0100
Subject: [PATCH] add detection of Apple iOS (BOOST_OS_IOS)

---
 include/boost/predef/os.h       |  1 +
 include/boost/predef/os/ios.h   | 37 +++++++++++++--------------------
 include/boost/predef/os/macos.h |  4 +++-
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/include/boost/predef/os.h b/include/boost/predef/os.h
index 3aceb3a..c74192e 100644
--- a/include/boost/predef/os.h
+++ b/include/boost/predef/os.h
@@ -16,6 +16,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 #include <boost/predef/os/cygwin.h>
 #include <boost/predef/os/hpux.h>
 #include <boost/predef/os/irix.h>
+#include <boost/predef/os/ios.h>
 #include <boost/predef/os/linux.h>
 #include <boost/predef/os/macos.h>
 #include <boost/predef/os/os400.h>
diff --git a/include/boost/predef/os/ios.h b/include/boost/predef/os/ios.h
index f71ddfb..a62fb49 100644
--- a/include/boost/predef/os/ios.h
+++ b/include/boost/predef/os/ios.h
@@ -5,54 +5,47 @@ Distributed under the Boost Software License, Version 1.0.
 http://www.boost.org/LICENSE_1_0.txt)
 */
 
-#ifndef BOOST_PREDEF_OS_MACOS_H
-#define BOOST_PREDEF_OS_MACOS_H
+#ifndef BOOST_PREDEF_OS_IOS_H
+#define BOOST_PREDEF_OS_IOS_H
 
 #include <boost/predef/version_number.h>
 #include <boost/predef/make.h>
 
 /*`
-[heading `BOOST_OS_MACOS`]
+[heading `BOOST_OS_IOS`]
 
-[@http://en.wikipedia.org/wiki/Mac_OS Mac OS] operating system.
+[@http://en.wikipedia.org/wiki/iOS iOS] operating system.
 
 [table
     [[__predef_symbol__] [__predef_version__]]
 
-    [[`macintosh`] [__predef_detection__]]
-    [[`Macintosh`] [__predef_detection__]]
     [[`__APPLE__`] [__predef_detection__]]
     [[`__MACH__`] [__predef_detection__]]
+    [[`__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__`] [__predef_detection__]]
 
-    [[`__APPLE__`, `__MACH__`] [10.0.0]]
-    [[ /otherwise/ ] [9.0.0]]
+    [[`__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__`] [__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__*1000]]
     ]
  */
 
-#define BOOST_OS_MACOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#define BOOST_OS_IOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
-    defined(macintosh) || defined(Macintosh) || \
-    (defined(__APPLE__) && defined(__MACH__)) \
+    defined(__APPLE__) && defined(__MACH__) && \
+    defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) \
     )
-#   undef BOOST_OS_MACOS
-#   if !defined(BOOST_OS_MACOS) && defined(__APPLE__) && defined(__MACH__)
-#       define BOOST_OS_MACOS BOOST_VERSION_NUMBER(10,0,0)
-#   endif
-#   if !defined(BOOST_OS_MACOS)
-#       define BOOST_OS_MACOS BOOST_VERSION_NUMBER(9,0,0)
-#   endif
+#   undef BOOST_OS_IOS
+#   define BOOST_OS_IOS (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__*1000)
 #endif
 
-#if BOOST_OS_MACOS
-#   define BOOST_OS_MACOS_AVAILABLE
+#if BOOST_OS_IOS
+#   define BOOST_OS_IOS_AVAILABLE
 #   include <boost/predef/detail/os_detected.h>
 #endif
 
-#define BOOST_OS_MACOS_NAME "Mac OS"
+#define BOOST_OS_IOS_NAME "iOS"
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_OS_MACOS,BOOST_OS_MACOS_NAME)
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_IOS,BOOST_OS_IOS_NAME)
 
 
 #endif
diff --git a/include/boost/predef/os/macos.h b/include/boost/predef/os/macos.h
index f71ddfb..1d34ece 100644
--- a/include/boost/predef/os/macos.h
+++ b/include/boost/predef/os/macos.h
@@ -23,6 +23,7 @@ http://www.boost.org/LICENSE_1_0.txt)
     [[`Macintosh`] [__predef_detection__]]
     [[`__APPLE__`] [__predef_detection__]]
     [[`__MACH__`] [__predef_detection__]]
+    [[`!__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__`] [__predef_detection__]]
 
     [[`__APPLE__`, `__MACH__`] [10.0.0]]
     [[ /otherwise/ ] [9.0.0]]
@@ -31,7 +32,8 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_MACOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && \
+    !defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && ( \
     defined(macintosh) || defined(Macintosh) || \
     (defined(__APPLE__) && defined(__MACH__)) \
     )