mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Avoid compiler warnrings
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@38888 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald
parent
5c4c80a8df
commit
78c05bfc01
4 changed files with 59 additions and 40 deletions
|
|
@ -34,15 +34,16 @@
|
|||
*/
|
||||
|
||||
#import "common.h"
|
||||
#import "Foundation/NSCoder.h"
|
||||
#import "Foundation/NSArray.h"
|
||||
#import "Foundation/NSCharacterSet.h"
|
||||
#import "Foundation/NSCoder.h"
|
||||
#import "Foundation/NSData.h"
|
||||
#import "Foundation/NSDictionary.h"
|
||||
#import "Foundation/NSCharacterSet.h"
|
||||
#import "Foundation/NSRange.h"
|
||||
#import "Foundation/NSException.h"
|
||||
#import "Foundation/NSValue.h"
|
||||
#import "Foundation/NSHashTable.h"
|
||||
#import "Foundation/NSKeyedArchiver.h"
|
||||
#import "Foundation/NSRange.h"
|
||||
#import "Foundation/NSValue.h"
|
||||
#import "GNUstepBase/GSObjCRuntime.h"
|
||||
|
||||
#import "GSPrivate.h"
|
||||
|
|
|
|||
|
|
@ -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\
|
||||
{\
|
||||
|
|
|
|||
43
configure
vendored
43
configure
vendored
|
|
@ -2732,13 +2732,18 @@ if test -z "$LIBRARY_COMBO"; then
|
|||
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 @@ fi
|
|||
|
||||
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 @@ rm -f conftest*
|
|||
# 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
|
||||
|
|
|
|||
43
configure.ac
43
configure.ac
|
|
@ -90,13 +90,18 @@ if test -z "$LIBRARY_COMBO"; then
|
|||
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 @@ if test "$nonfragile" = "yes"; then
|
|||
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 @@ AC_EGREP_HEADER(objc_get_uninstalled_dtable, objc/objc-api.h,
|
|||
# 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
|
||||
|
|
|
|||
Loading…
Reference in a new issue