2
0
Эх сурвалжийг харах

Merge fiix compilation on newer versions of Mac OS X (Lion and up). Thanks Ryan McKern.

Jelmer Vernooij 13 жил өмнө
parent
commit
a2e3c9bde8
2 өөрчлөгдсөн 3 нэмэгдсэн , 1 устгасан
  1. 2 0
      NEWS
  2. 1 1
      dulwich/_objects.c

+ 2 - 0
NEWS

@@ -8,6 +8,8 @@
 
   * Fix use of SubprocessWrapper on Windows. (Paulo Madeira, #670035)
 
+  * Fix compilation on newer versions of Mac OS X (Lion and up). (Ryan McKern, #794543)
+
 0.7.1	2011-04-12
 
  BUG FIXES

+ 1 - 1
dulwich/_objects.c

@@ -25,7 +25,7 @@
 typedef int Py_ssize_t;
 #endif
 
-#if defined(__MINGW32_VERSION) || defined(__APPLE__)
+#if defined(__MINGW32_VERSION) || (defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
 size_t strnlen(char *text, size_t maxlen)
 {
 	const char *last = memchr(text, '\0', maxlen);