Darwin: make sure that VKI_AT_FDCWD is defined on old systems

We claim support for OSX 10.8 and 10.9 byut they don't have
AT_FDCWD. So define it ourselves.

Part of the fixes for https://bugs.kde.org/show_bug.cgi?id=519604

diff --git a/configure.ac b/configure.ac
index 049813c1e05a6ba16b7599fdfca1bbfbf3642ca4..282b8e731ff8788c151b25cd761b7a8b4a183a24 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -451,9 +451,6 @@ case "${host_os}" in
         AC_DEFINE_UNQUOTED([$1], [$$1], [DARWIN_VERS value for $3])
         AC_SUBST($1)
       ])
-      AC_ADD_DARWIN_VERS([DARWIN_10_5], 100500, [DARWIN_VERS value for Mac OS X 10.5])
-      AC_ADD_DARWIN_VERS([DARWIN_10_6], 100600, [DARWIN_VERS value for Mac OS X 10.6 / iOS 4])
-      AC_ADD_DARWIN_VERS([DARWIN_10_7], 100700, [DARWIN_VERS value for Mac OS X 10.7 / iOS 5])
       AC_ADD_DARWIN_VERS([DARWIN_10_8], 100800, [DARWIN_VERS value for Mac OS X 10.8 / iOS 6])
       AC_ADD_DARWIN_VERS([DARWIN_10_9], 100900, [DARWIN_VERS value for Mac OS X 10.9 / iOS 7])
       AC_ADD_DARWIN_VERS([DARWIN_10_10], 101000, [DARWIN_VERS value for Mac OS X 10.10 / iOS 8])

diff --git a/include/vki/vki-darwin.h b/include/vki/vki-darwin.h
index 47a90ec5f59b19e2c31e1f700451b2954b580d35..4c2c26af821c193b404210a84b33258462825600 100644 (file)
--- a/include/vki/vki-darwin.h
+++ b/include/vki/vki-darwin.h
@@ -373,7 +373,15 @@ typedef uint32_t vki_u32;
 #define        VKI_O_EXCL      O_EXCL
 #define        VKI_O_EVTONLY   O_EVTONLY
 
+/* OSX 10.6 was the first to get any *at functions like openat
+ * but it wasn't until OSX 10.10 that a definition for AT_FDCWD
+ * was added. We dont claim to support anything older than 10.8
+ * any more, so no need to worry about versions older than that. */
+#if DARWIN_VERS >= DARWIN_10_10
 #define VKI_AT_FDCWD AT_FDCWD
+#else
+#define VKI_AT_FDCWD -2
+#endif
 
 #define        VKI_F_DUPFD     F_DUPFD
 #define        VKI_F_GETFD     F_GETFD