Author: rfm
Date: Sun Aug 16 12:42:48 2015
New Revision: 38888
URL: http://svn.gna.org/viewcvs/gnustep?rev=38888&view=rev
Log:
Avoid compiler warnrings
Modified:
libs/base/trunk/Source/GSString.m
libs/base/trunk/Source/NSLock.m
libs/base/trunk/configure
libs/base/trunk/configure.ac
Modified: libs/base/trunk/Source/GSString.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/GSString.m?rev=38888&r1=38887&r2=38888&view=diff
==============================================================================
--- libs/base/trunk/Source/GSString.m (original)
+++ libs/base/trunk/Source/GSString.m Sun Aug 16 12:42:48 2015
@@ -34,15 +34,16 @@
*/
#import "common.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSCharacterSet.h"
#import "Foundation/NSCoder.h"
-#import "Foundation/NSArray.h"
#import "Foundation/NSData.h"
#import "Foundation/NSDictionary.h"
-#import "Foundation/NSCharacterSet.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSHashTable.h"
+#import "Foundation/NSKeyedArchiver.h"
#import "Foundation/NSRange.h"
-#import "Foundation/NSException.h"
#import "Foundation/NSValue.h"
-#import "Foundation/NSKeyedArchiver.h"
#import "GNUstepBase/GSObjCRuntime.h"
#import "GSPrivate.h"
Modified: libs/base/trunk/Source/NSLock.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSLock.m?rev=38888&r1=38887&r2=38888&view=diff
==============================================================================
--- libs/base/trunk/Source/NSLock.m (original)
+++ libs/base/trunk/Source/NSLock.m Sun Aug 16 12:42:48 2015
@@ -67,10 +67,10 @@
if (_name == nil)\
{\
return [NSString stringWithFormat: @"%@ (locked by %llu)",\
- [super description], (NSUInteger)_mutex.__data.__owner];\
+ [super description], (unsigned long long)_mutex.__data.__owner];\
}\
return [NSString stringWithFormat: @"%@ '%@' (locked by %llu)",\
- [super description], _name, (NSUInteger)_mutex.__data.__owner];\
+ [super description], _name, (unsigned long
long)_mutex.__data.__owner];\
}\
else\
{\
Modified: libs/base/trunk/configure
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/configure?rev=38888&r1=38887&r2=38888&view=diff
==============================================================================
--- libs/base/trunk/configure (original)
+++ libs/base/trunk/configure Sun Aug 16 12:42:48 2015
@@ -2732,13 +2732,18 @@
LIBRARY_COMBO=`gnustep-config --variable=LIBRARY_COMBO 2>&5`
fi
-nonfragile=`gnustep-config --objc-flags | grep _NONFRAGILE_ABI 2>&5`
-if test -z "$nonfragile"; then
- nonfragile=no
- BASE_NONFRAGILE_ABI=0
-else
+if test "$OBJC_RUNTIME_LIB" = "ng"; then
nonfragile=yes
BASE_NONFRAGILE_ABI=1
+else
+ nonfragile=`gnustep-config --objc-flags | grep _NONFRAGILE_ABI 2>&5`
+ if test -z "$nonfragile"; then
+ nonfragile=no
+ BASE_NONFRAGILE_ABI=0
+ else
+ nonfragile=yes
+ BASE_NONFRAGILE_ABI=1
+ fi
fi
@@ -7980,7 +7985,7 @@
CPPFLAGS="$saved_CPPFLAGS"
if test $non_fragile = yes; then
- OBJCFLAGS="$OBJCFLAGS -fobjc-nonfragile-abi"
+ OBJCLIBS="$OBJLIBS -fobjc-nonfragile-abi"
GS_NONFRAGILE=1
# Check whether --enable-mixedabi was given.
if test "${enable_mixedabi+set}" = set; then :
@@ -8026,19 +8031,23 @@
# Native Objective-C exceptions
#--------------------------------------------------------------------
-# First of all, determine if native Objective-C exceptions are enabled
-# in gnustep-make. They are enabled if the compiler supports it; they
-# are disabled if it doesn't. And, of course, the user may have
-# forced one behaviour or the other. Note that we go and look at the
-# actual config.make file to be able to know what was configured in
-# gnustep-make regardless of any gnustep-base that is currently
-# installed. We can't use `gnustep-config --objc-flags` because that
-# may report native exceptions as disabled because the currently
-# installed gnustep-base has them disabled.
-if grep USE_OBJC_EXCEPTIONS $CURRENT_GNUSTEP_MAKEFILES/$lobj_dir/config.make |
grep yes >&5 2>&5; then
+if test "$OBJC_RUNTIME_LIB" = "ng"; then
exceptions=yes
else
- exceptions=no
+ # Determine if native Objective-C exceptions are enabled
+ # in gnustep-make. They are enabled if the compiler supports it; they
+ # are disabled if it doesn't. And, of course, the user may have
+ # forced one behaviour or the other. Note that we go and look at the
+ # actual config.make file to be able to know what was configured in
+ # gnustep-make regardless of any gnustep-base that is currently
+ # installed. We can't use `gnustep-config --objc-flags` because that
+ # may report native exceptions as disabled because the currently
+ # installed gnustep-base has them disabled.
+ if grep USE_OBJC_EXCEPTIONS $CURRENT_GNUSTEP_MAKEFILES/$lobj_dir/config.make
| grep yes >&5 2>&5; then
+ exceptions=yes
+ else
+ exceptions=no
+ fi
fi
# At this point, if exceptions=no, then native exceptions are disabled
Modified: libs/base/trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/configure.ac?rev=38888&r1=38887&r2=38888&view=diff
==============================================================================
--- libs/base/trunk/configure.ac (original)
+++ libs/base/trunk/configure.ac Sun Aug 16 12:42:48 2015
@@ -90,13 +90,18 @@
LIBRARY_COMBO=`gnustep-config --variable=LIBRARY_COMBO 2>&5`
fi
-nonfragile=`gnustep-config --objc-flags | grep _NONFRAGILE_ABI 2>&5`
-if test -z "$nonfragile"; then
- nonfragile=no
- BASE_NONFRAGILE_ABI=0
-else
+if test "$OBJC_RUNTIME_LIB" = "ng"; then
nonfragile=yes
BASE_NONFRAGILE_ABI=1
+else
+ nonfragile=`gnustep-config --objc-flags | grep _NONFRAGILE_ABI 2>&5`
+ if test -z "$nonfragile"; then
+ nonfragile=no
+ BASE_NONFRAGILE_ABI=0
+ else
+ nonfragile=yes
+ BASE_NONFRAGILE_ABI=1
+ fi
fi
AC_SUBST(BASE_NONFRAGILE_ABI)
@@ -1984,7 +1989,7 @@
non_fragile="$cross_non_fragile")
CPPFLAGS="$saved_CPPFLAGS"
if test $non_fragile = yes; then
- OBJCFLAGS="$OBJCFLAGS -fobjc-nonfragile-abi"
+ OBJCLIBS="$OBJLIBS -fobjc-nonfragile-abi"
GS_NONFRAGILE=1
AC_ARG_ENABLE(mixedabi,
[ --disable-mixedabi
@@ -2017,19 +2022,23 @@
# Native Objective-C exceptions
#--------------------------------------------------------------------
-# First of all, determine if native Objective-C exceptions are enabled
-# in gnustep-make. They are enabled if the compiler supports it; they
-# are disabled if it doesn't. And, of course, the user may have
-# forced one behaviour or the other. Note that we go and look at the
-# actual config.make file to be able to know what was configured in
-# gnustep-make regardless of any gnustep-base that is currently
-# installed. We can't use `gnustep-config --objc-flags` because that
-# may report native exceptions as disabled because the currently
-# installed gnustep-base has them disabled.
-if grep USE_OBJC_EXCEPTIONS $CURRENT_GNUSTEP_MAKEFILES/$lobj_dir/config.make |
grep yes >&5 2>&5; then
+if test "$OBJC_RUNTIME_LIB" = "ng"; then
exceptions=yes
else
- exceptions=no
+ # Determine if native Objective-C exceptions are enabled
+ # in gnustep-make. They are enabled if the compiler supports it; they
+ # are disabled if it doesn't. And, of course, the user may have
+ # forced one behaviour or the other. Note that we go and look at the
+ # actual config.make file to be able to know what was configured in
+ # gnustep-make regardless of any gnustep-base that is currently
+ # installed. We can't use `gnustep-config --objc-flags` because that
+ # may report native exceptions as disabled because the currently
+ # installed gnustep-base has them disabled.
+ if grep USE_OBJC_EXCEPTIONS $CURRENT_GNUSTEP_MAKEFILES/$lobj_dir/config.make
| grep yes >&5 2>&5; then
+ exceptions=yes
+ else
+ exceptions=no
+ fi
fi
# At this point, if exceptions=no, then native exceptions are disabled
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
