Author: rfm
Date: Mon Jun 22 11:33:37 2015
New Revision: 38667
URL: http://svn.gna.org/viewcvs/gnustep?rev=38667&view=rev
Log:
minor tweaks for Yosemite
Modified:
libs/base/trunk/ChangeLog
libs/base/trunk/Headers/GNUstepBase/Additions.h
libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in
libs/base/trunk/Headers/GNUstepBase/GSVersionMacros.h
Modified: libs/base/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/ChangeLog?rev=38667&r1=38666&r2=38667&view=diff
==============================================================================
--- libs/base/trunk/ChangeLog (original)
+++ libs/base/trunk/ChangeLog Mon Jun 22 11:33:37 2015
@@ -1,3 +1,10 @@
+2015-06-22 Richard Frith-Macdonald <[email protected]>
+
+ * Headers/GNUstepBase/Additions.h:
+ * Headers/GNUstepBase/GSConfig.h.in:
+ * Headers/GNUstepBase/GSVersionMacros.h:
+ Minor tweaks to build and avoid warnings in Yosemite
+
2015-06-14 Riccardo Mottola <[email protected]>
* Headers/Foundation/NSData.h
Modified: libs/base/trunk/Headers/GNUstepBase/Additions.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Headers/GNUstepBase/Additions.h?rev=38667&r1=38666&r2=38667&view=diff
==============================================================================
--- libs/base/trunk/Headers/GNUstepBase/Additions.h (original)
+++ libs/base/trunk/Headers/GNUstepBase/Additions.h Mon Jun 22 11:33:37 2015
@@ -30,7 +30,10 @@
#import <GNUstepBase/GSVersionMacros.h>
#import <GNUstepBase/GNUstep.h>
+
+#if !(defined(NeXT_RUNTIME) || defined(Apple_RUNTIME))
#import <GNUstepBase/GSBlocks.h>
+#endif
#import <GNUstepBase/GSFunctions.h>
#import <GNUstepBase/GSLocale.h>
#import <GNUstepBase/GSLock.h>
Modified: libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in?rev=38667&r1=38666&r2=38667&view=diff
==============================================================================
--- libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in (original)
+++ libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in Mon Jun 22 11:33:37 2015
@@ -409,12 +409,19 @@
#endif
#if !__has_feature(objc_arc)
-# if __OBJC_GC__
-# define __strong __attribute__((objc_gc(strong)))
-# define __weak __attribute__((objc_gc(weak)))
-# else
-# define __strong
-# define __weak
+# if !defined(__weak)
+# if __OBJC_GC__
+# define __weak __attribute__((objc_gc(weak)))
+# else
+# define __weak
+# endif
+# endif
+# if !defined(__strong)
+# if __OBJC_GC__
+# define __strong __attribute__((objc_gc(strong)))
+# else
+# define __strong
+# endif
# endif
#endif
Modified: libs/base/trunk/Headers/GNUstepBase/GSVersionMacros.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Headers/GNUstepBase/GSVersionMacros.h?rev=38667&r1=38666&r2=38667&view=diff
==============================================================================
--- libs/base/trunk/Headers/GNUstepBase/GSVersionMacros.h (original)
+++ libs/base/trunk/Headers/GNUstepBase/GSVersionMacros.h Mon Jun 22
11:33:37 2015
@@ -406,27 +406,35 @@
/* Attribute macros compatible with Apple.
*/
+#ifndef NS_FORMAT_ARGUMENT
#if defined(__clang__) || GS_GCC_MINREQ(4,2)
# define NS_FORMAT_ARGUMENT(A) __attribute__((format_arg(A)))
#else
# define NS_FORMAT_ARGUMENT(F,A)
#endif
+#endif
// FIXME ... what version of gcc?
+#ifndef NS_FORMAT_FUNCTION
#if __clang__
# define NS_FORMAT_FUNCTION(F,A) __attribute__((format(__NSString__, F, A)))
#else
# define NS_FORMAT_FUNCTION(F,A)
#endif
-
+#endif
+
+#ifndef NS_REQUIRES_NIL_TERMINATION
#define NS_REQUIRES_NIL_TERMINATION __attribute__((sentinel))
+#endif
// FIXME ... what exact version of clang and gcc?
+#ifndef UNAVAILABLE_ATTRIBUTE
#if defined(__clang__) || GS_GCC_MINREQ(4,0)
# define UNAVAILABLE_ATTRIBUTE __attribute__((unavailable))
#else
# define UNAVAILABLE_ATTRIBUTE
#endif
+#endif
/* Check if compiler supports @optional in protocols
*/
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
