objc4-532.2.tar.gz

[apple/objc4.git] / runtime / objc-api.h

diff --git a/runtime/objc-api.h b/runtime/objc-api.h
index 2fcb92f80e0ea1cfb5f84940bc7562baea27f081..94130b92ecc1befc3fe8aa47fd8e4f2f95c2f0a9 100644 (file)
--- a/runtime/objc-api.h
+++ b/runtime/objc-api.h
@@ -25,6 +25,7 @@
 #ifndef _OBJC_OBJC_API_H_
 #define _OBJC_OBJC_API_H_
 
 #ifndef _OBJC_OBJC_API_H_
 #define _OBJC_OBJC_API_H_
 

+#include <Availability.h>

 #include <AvailabilityMacros.h>
 #include <TargetConditionals.h>
 
 #include <AvailabilityMacros.h>
 #include <TargetConditionals.h>
 


@@ -32,18 +33,31 @@
 #   define __has_feature(x) 0
 #endif
 
 #   define __has_feature(x) 0
 #endif
 

+#ifndef __has_extension
+#   define __has_extension __has_feature
+#endif
+
+

 /*
  * OBJC_API_VERSION 0 or undef: Tiger and earlier API only
  * OBJC_API_VERSION 2: Leopard and later API available
  */
 #if !defined(OBJC_API_VERSION)
 /*
  * OBJC_API_VERSION 0 or undef: Tiger and earlier API only
  * OBJC_API_VERSION 2: Leopard and later API available
  */
 #if !defined(OBJC_API_VERSION)

-#   if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+#   if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)  &&  __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_5

 #       define OBJC_API_VERSION 0
 #   else
 #       define OBJC_API_VERSION 2
 #   endif
 #endif
 
 #       define OBJC_API_VERSION 0
 #   else
 #       define OBJC_API_VERSION 2
 #   endif
 #endif
 

+
+/* OBJC_OLD_DISPATCH_PROTOTYPES == 0 enforces the rule that the dispatch 
+ * functions must be cast to an appropriate function pointer type. */
+#if !defined(OBJC_OLD_DISPATCH_PROTOTYPES)
+#   define OBJC_OLD_DISPATCH_PROTOTYPES 1
+#endif
+
+

 /* OBJC2_UNAVAILABLE: unavailable in objc 2.0, deprecated in Leopard */
 #if !defined(OBJC2_UNAVAILABLE)
 #   if __OBJC2__
 /* OBJC2_UNAVAILABLE: unavailable in objc 2.0, deprecated in Leopard */
 #if !defined(OBJC2_UNAVAILABLE)
 #   if __OBJC2__


@@ -56,12 +70,29 @@
 /* OBJC_ARC_UNAVAILABLE: unavailable with -fobjc-arc */
 #if !defined(OBJC_ARC_UNAVAILABLE)
 #   if __has_feature(objc_arr)
 /* OBJC_ARC_UNAVAILABLE: unavailable with -fobjc-arc */
 #if !defined(OBJC_ARC_UNAVAILABLE)
 #   if __has_feature(objc_arr)

-#       define OBJC_ARC_UNAVAILABLE __attribute__((unavailable("not available in automatic reference counting mode")))
+#       if __has_extension(attribute_unavailable_with_message)
+#           define OBJC_ARC_UNAVAILABLE __attribute__((unavailable("not available in automatic reference counting mode")))
+#       else
+#           define OBJC_ARC_UNAVAILABLE __attribute__((unavailable))
+#       endif

 #   else
 #       define OBJC_ARC_UNAVAILABLE
 #   endif
 #endif
 
 #   else
 #       define OBJC_ARC_UNAVAILABLE
 #   endif
 #endif
 

+/* OBJC_GC_UNAVAILABLE: unavailable with -fobjc-gc or -fobjc-gc-only */
+#if !defined(OBJC_GC_UNAVAILABLE)
+#   if __OBJC_GC__
+#       if __has_extension(attribute_unavailable_with_message)
+#           define OBJC_GC_UNAVAILABLE __attribute__((unavailable("not available in garbage collecting mode")))
+#       else
+#           define OBJC_GC_UNAVAILABLE __attribute__((unavailable))
+#       endif
+#   else
+#       define OBJC_GC_UNAVAILABLE
+#   endif
+#endif
+

 #if !defined(OBJC_EXTERN)
 #   if defined(__cplusplus)
 #       define OBJC_EXTERN extern "C" 
 #if !defined(OBJC_EXTERN)
 #   if defined(__cplusplus)
 #       define OBJC_EXTERN extern "C"