Merge pull request #222 from apple/das-disable-linux-membarrier-include-3.1

Swift 3.1: remove unused dependency on linux/membarrier.h for intel to fix CI build
diff --git a/dispatch/dispatch.h b/dispatch/dispatch.h
index 52cd3e7..585940c 100644
--- a/dispatch/dispatch.h
+++ b/dispatch/dispatch.h
@@ -24,14 +24,20 @@
 #ifdef __APPLE__
 #include <Availability.h>
 #include <TargetConditionals.h>
-#endif
-
+#else
 #ifndef API_AVAILABLE
 #define API_AVAILABLE(...)
+#endif
+#ifndef API_DEPRECATED
 #define API_DEPRECATED(...)
+#endif
+#ifndef API_UNAVAILABLE
 #define API_UNAVAILABLE(...)
+#endif
+#ifndef API_DEPRECATED_WITH_REPLACEMENT
 #define API_DEPRECATED_WITH_REPLACEMENT(...)
-#endif // !API_AVAILABLE
+#endif
+#endif // __APPLE__
 
 #include <sys/cdefs.h>
 #include <sys/types.h>