From fa3fbf940c83fc789a98f916252ae6e024a9a989 Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <corrmage@gmail.com>
Date: Fri, 2 Mar 2012 14:10:11 +0400
Subject: [PATCH] Fix for OS X 10.6 support

---
 libs/platform/string.h | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/libs/platform/string.h b/libs/platform/string.h
index 89ac141a8..0b67e50ea 100644
--- a/libs/platform/string.h
+++ b/libs/platform/string.h
@@ -2,13 +2,33 @@
 #ifndef _STRING_WRAPPER_H
 #define _STRING_WRAPPER_H
 
+#ifdef __APPLE__
+#include <Availability.h>
+#endif
+
 #include <string.h>
-#if (defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070) || defined(__MINGW32__)
+#if (defined(__APPLE__) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1070) || defined(__MINGW32__)
 // need our own implementation of strnlen
+#ifdef __MINGW32__
 static size_t strnlen(const char *s, size_t n)
 {
-  const char *p = (const char *)memchr(s, 0, n);
-  return(p ? p-s : n);
+    const char *p = (const char *)memchr(s, 0, n);
+    return(p ? p-s : n);
+}
+#elif (defined(__APPLE__) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
+static size_t mw_strnlen(const char *s, size_t n)
+{
+    if (strnlen != NULL) {
+        return strnlen(s, n);
+    }
+	else {
+  		const char *p = (const char *)memchr(s, 0, n);
+  		return(p ? p-s : n);
+  	}
 }
+#define strnlen mw_strnlen
 #endif
+
+#endif
+
 #endif