1 files changed, 41 insertions, 1 deletions
diff --git a/platform/darwin/src/MGLLoggingConfiguration_Private.h b/platform/darwin/src/MGLLoggingConfiguration_Private.h
index ff7e85eed8..34e999ca72 100644
--- a/platform/darwin/src/MGLLoggingConfiguration_Private.h
+++ b/platform/darwin/src/MGLLoggingConfiguration_Private.h
@@ -1,9 +1,48 @@
 #import "MGLLoggingConfiguration.h"
 
+NS_INLINE NSString *MGLStringFromBOOL(BOOL value) {
+    return value ? @"YES" : @"NO";
+}
+
+#ifdef MGL_LOGGING_DISABLED
+
+#define MGLLogInfo(...)
+#define MGLLogDebug(...)
+#define MGLLogError(...)
+#define MGLLogFault(...)
+
+#else
+
+#if MGL_LOGGING_ENABLE_DEBUG
+    #define MGLLogDebug(message, ...) MGLLogWithType(MGLLoggingLevelDebug, __PRETTY_FUNCTION__, __LINE__, message, ##__VA_ARGS__)
+#else
+    #define MGLLogDebug(...)
+#endif
+
 #define MGLLogInfo(message, ...)  MGLLogWithType(MGLLoggingLevelInfo, __PRETTY_FUNCTION__, __LINE__, message, ##__VA_ARGS__)
-#define MGLLogDebug(message, ...) MGLLogWithType(MGLLoggingLevelDebug, __PRETTY_FUNCTION__, __LINE__, message, ##__VA_ARGS__)
 #define MGLLogError(message, ...) MGLLogWithType(MGLLoggingLevelError, __PRETTY_FUNCTION__, __LINE__, message, ##__VA_ARGS__)
 #define MGLLogFault(message, ...) MGLLogWithType(MGLLoggingLevelFault, __PRETTY_FUNCTION__, __LINE__, message, ##__VA_ARGS__)
+
+#endif
+
+#define MGLAssert(expression, message, ...) \
+    __extension__({ \
+        if (__builtin_expect(!(expression), 0)) { \
+            MGLLogFault(message, ##__VA_ARGS__); \
+        } \
+        NSAssert(expression, message, ##__VA_ARGS__); \
+    })
+#define MGLCAssert(expression, message, ...) \
+    __extension__({ \
+        if (__builtin_expect(!(expression), 0)) { \
+            MGLLogFault(message, ##__VA_ARGS__); \
+        } \
+        NSCAssert(expression, message, ##__VA_ARGS__); \
+    })
+
+
+#ifndef MGL_LOGGING_DISABLED
+
 #define MGLLogWithType(type, function, line, message, ...) \
 { \
     if ([MGLLoggingConfiguration sharedConfiguration].loggingLevel != MGLLoggingLevelNone && type <= [MGLLoggingConfiguration sharedConfiguration].loggingLevel) \
@@ -17,3 +56,4 @@
 - (void)logCallingFunction:(const char *)callingFunction functionLine:(NSUInteger)functionLine messageType:(MGLLoggingLevel)type format:(id)messageFormat, ...;
 
 @end
+#endif