---
Headers/Foundation/NSObjCRuntime.h | 18 ------------------
Headers/GNUstepBase/GSVersionMacros.h | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/Headers/Foundation/NSObjCRuntime.h b/Headers/Foundation/NSObjCRuntime.h
index 1ec6802..82ca47b 100644
--- a/Headers/Foundation/NSObjCRuntime.h
+++ b/Headers/Foundation/NSObjCRuntime.h
@@ -115,24 +115,6 @@ enum
*/
typedef NSUInteger NSSortOptions;
-#ifdef __clang__
-#define NS_REQUIRES_NIL_TERMINATION __attribute__((sentinel))
-#else
-#define NS_REQUIRES_NIL_TERMINATION
-#endif //__clang__
-
-#ifdef __clang__
-#define NS_FORMAT_FUNCTION(F,A) __attribute__((format(__NSString__, F, A)))
-#else
-#define NS_FORMAT_FUNCTION(F,A)
-#endif //__clang__
-
-#ifdef __clang__
-#define NS_FORMAT_ARGUMENT(A) __attribute__((format_arg(A)))
-#else
-#define NS_FORMAT_ARGUMENT(A)
-#endif //__clang__
-
#import <GNUstepBase/GSObjCRuntime.h>
#if OS_API_VERSION(100500,GS_API_LATEST)
diff --git a/Headers/GNUstepBase/GSVersionMacros.h b/Headers/GNUstepBase/GSVersionMacros.h
index 958670d..8cde41b 100644
--- a/Headers/GNUstepBase/GSVersionMacros.h
+++ b/Headers/GNUstepBase/GSVersionMacros.h
@@ -276,6 +276,24 @@ static inline void gs_consumed(id NS_CONSUMED __attribute__ ((unused))o) { retur
#define GS_CONSUMED(O)
#endif
+#ifdef __clang__
+#define NS_REQUIRES_NIL_TERMINATION __attribute__((sentinel))
+#else
+#define NS_REQUIRES_NIL_TERMINATION
+#endif //__clang__
+
+#ifdef __clang__
+#define NS_FORMAT_FUNCTION(F,A) __attribute__((format(__NSString__, F, A)))
+#else
+#define NS_FORMAT_FUNCTION(F,A)
+#endif //__clang__
+
+#ifdef __clang__
+#define NS_FORMAT_ARGUMENT(A) __attribute__((format_arg(A)))
+#else
+#define NS_FORMAT_ARGUMENT(A)
+#endif //__clang__
+
/* Include the appropriate header for ObjC2 blocks support if it is in use.
*
* FIXME: "OBJC2RUNTIME" is set to "1" if the runtime supports the ObjC2
_______________________________________________
Gnustep-dev mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/gnustep-dev
