move DISPATCH_LINUX_UNAVAILABLE to base.h and match it with existing header annotation macros

switch guard for vm_deallocate to HAVE_MACH

Signed-off-by: Daniel A. Steffen <dsteffen@apple.com>

Author: das

dispatch/base.h

@@ -64,6 +64,7 @@
 #define DISPATCH_MALLOC __attribute__((__malloc__))
 #define DISPATCH_ALWAYS_INLINE __attribute__((__always_inline__))
 #define DISPATCH_UNAVAILABLE __attribute__((__unavailable__))
+#define DISPATCH_UNAVAILABLE_MSG(msg) __attribute__((__unavailable__(msg)))
 #else
 /*! @parseOnly */
 #define DISPATCH_NORETURN
@@ -99,6 +100,16 @@
 #define DISPATCH_ALWAYS_INLINE
 /*! @parseOnly */
 #define DISPATCH_UNAVAILABLE
+/*! @parseOnly */
+#define DISPATCH_UNAVAILABLE_MSG(msg)
+#endif
+
+#ifdef __linux__
+#define DISPATCH_LINUX_UNAVAILABLE() \
+		DISPATCH_UNAVAILABLE_MSG( \
+		"This interface is unavailable on linux systems")
+#else
+#define DISPATCH_LINUX_UNAVAILABLE()
 #endif
 
 #ifndef DISPATCH_ALIAS_V2

dispatch/dispatch.h

@@ -47,23 +47,10 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#ifdef __has_attribute
-#if __has_attribute(unavailable)
-#define __DISPATCH_UNAVAILABLE(msg) __attribute__((__unavailable__(msg)))
-#endif
-#endif
-#ifndef __DISPATCH_UNAVAILABLE
-#define __DISPATCH_UNAVAILABLE(msg)
-#endif
-
 #ifdef __linux__
 #ifdef __DISPATCH_BUILDING_SWIFT_MODULE__
 #include <stdio.h> // for off_t
 #endif
-#define DISPATCH_LINUX_UNAVAILABLE() \
-		__DISPATCH_UNAVAILABLE("This interface is unavailable on linux systems")
-#else
-#define DISPATCH_LINUX_UNAVAILABLE()
 #endif
 
 #define DISPATCH_API_VERSION 20160612

src/data.c

@@ -108,7 +108,7 @@ const dispatch_block_t _dispatch_data_destructor_none = ^{
 	DISPATCH_INTERNAL_CRASH(0, "none destructor called");
 };
 
-#ifndef __linux__
+#if HAVE_MACH
 const dispatch_block_t _dispatch_data_destructor_vm_deallocate = ^{
 	DISPATCH_INTERNAL_CRASH(0, "vmdeallocate destructor called");
 };
@@ -249,7 +249,7 @@ dispatch_data_create_f(const void *buffer, size_t size, dispatch_queue_t queue,
 	if (destructor != DISPATCH_DATA_DESTRUCTOR_DEFAULT &&
 			destructor != DISPATCH_DATA_DESTRUCTOR_FREE &&
 			destructor != DISPATCH_DATA_DESTRUCTOR_NONE &&
-#ifndef __linux__
+#if HAVE_MACH
 			destructor != DISPATCH_DATA_DESTRUCTOR_VM_DEALLOCATE &&
 #endif
 			destructor != DISPATCH_DATA_DESTRUCTOR_INLINE) {