Author: rfm
Date: Thu Oct 8 11:04:48 2015
New Revision: 39041
URL: http://svn.gna.org/viewcvs/gnustep?rev=39041&view=rev
Log:
fixup for old runtime
Modified:
libs/base/trunk/Source/Additions/GSObjCRuntime.m
libs/base/trunk/Source/GSFFCallInvocation.m
libs/base/trunk/Source/GSValue.m
libs/base/trunk/Source/NSArchiver.m
libs/base/trunk/Source/NSData.m
libs/base/trunk/Source/NSDecimalNumber.m
libs/base/trunk/Source/NSKeyValueObserving.m
libs/base/trunk/Source/NSKeyedArchiver.m
libs/base/trunk/Source/NSKeyedUnarchiver.m
libs/base/trunk/Source/NSMethodSignature.m
libs/base/trunk/Source/NSNumberFormatter.m
libs/base/trunk/Source/NSPortCoder.m
libs/base/trunk/Source/NSUnarchiver.m
libs/base/trunk/Source/cifframe.m
Modified: libs/base/trunk/Source/Additions/GSObjCRuntime.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/Additions/GSObjCRuntime.m?rev=39041&r1=39040&r2=39041&view=diff
==============================================================================
--- libs/base/trunk/Source/Additions/GSObjCRuntime.m (original)
+++ libs/base/trunk/Source/Additions/GSObjCRuntime.m Thu Oct 8 11:04:48 2015
@@ -1090,8 +1090,7 @@
}
break;
-#if __GNUC__ != 2
-#ifdef _C_BOOL
+#if __GNUC__ != 2 && defined(_C_BOOL)
case _C_BOOL:
{
_Bool v;
@@ -1111,7 +1110,6 @@
}
break;
#endif
-#endif
case _C_SHT:
{
@@ -1557,8 +1555,7 @@
}
break;
-#if __GNUC__ != 2
-#ifdef _C_BOOL
+#if __GNUC__ != 2 && defined(_C_BOOL)
case _C_BOOL:
{
_Bool v = (_Bool)[val boolValue];
@@ -1579,7 +1576,6 @@
}
break;
#endif
-#endif
case _C_SHT:
{
Modified: libs/base/trunk/Source/GSFFCallInvocation.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/GSFFCallInvocation.m?rev=39041&r1=39040&r2=39041&view=diff
==============================================================================
--- libs/base/trunk/Source/GSFFCallInvocation.m (original)
+++ libs/base/trunk/Source/GSFFCallInvocation.m Thu Oct 8 11:04:48 2015
@@ -425,7 +425,7 @@
case _C_DBL:
vatype->type = __VAdouble;
break;
-#if __GNUC__ != 2
+#ifdef _C_BOOL
case _C_BOOL:
vatype->type = __VAuchar;
break;
@@ -614,7 +614,7 @@
CASE_TYPE(_C_ULNG_LNG, unsigned long long, av_start_ulonglong)
CASE_TYPE(_C_FLT, float, av_start_float)
CASE_TYPE(_C_DBL, double, av_start_double)
-#if __GNUC__ != 2
+#ifdef _C_BOOL
CASE_TYPE(_C_BOOL, _Bool, av_start_uchar)
#endif
@@ -719,7 +719,7 @@
CASE_TYPE(_C_ULNG_LNG, unsigned long long, av_ulonglong)
CASE_TYPE(_C_FLT, float, av_float)
CASE_TYPE(_C_DBL, double, av_double)
-#if __GNUC__ != 2
+#ifdef _C_BOOL
CASE_TYPE(_C_BOOL, _Bool, av_uchar)
#endif
@@ -1057,7 +1057,7 @@
CASE_TYPE(_C_ULNG_LNG, unsigned long long, va_arg_ulonglong)
CASE_TYPE(_C_FLT, float, va_arg_float)
CASE_TYPE(_C_DBL, double, va_arg_double)
-#if __GNUC__ != 2
+#ifdef _C_BOOL
CASE_TYPE(_C_BOOL, _Bool, va_arg_uchar)
#endif
@@ -1120,7 +1120,7 @@
CASE_TYPE(_C_ULNG_LNG, unsigned long long, va_return_ulonglong)
CASE_TYPE(_C_FLT, float, va_return_float)
CASE_TYPE(_C_DBL, double, va_return_double)
-#if __GNUC__ != 2
+#ifdef _C_BOOL
CASE_TYPE(_C_BOOL, _Bool, va_return_uchar)
#endif
Modified: libs/base/trunk/Source/GSValue.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/GSValue.m?rev=39041&r1=39040&r2=39041&view=diff
==============================================================================
--- libs/base/trunk/Source/GSValue.m (original)
+++ libs/base/trunk/Source/GSValue.m Thu Oct 8 11:04:48 2015
@@ -61,7 +61,7 @@
case _C_ULNG_LNG: return sizeof(unsigned long long);
case _C_FLT: return sizeof(float);
case _C_DBL: return sizeof(double);
-#if __GNUC__ != 2
+#ifdef _C_BOOL
case _C_BOOL: return sizeof(_Bool);
#endif
case _C_PTR: return sizeof(void*);
Modified: libs/base/trunk/Source/NSArchiver.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSArchiver.m?rev=39041&r1=39040&r2=39041&view=diff
==============================================================================
--- libs/base/trunk/Source/NSArchiver.m (original)
+++ libs/base/trunk/Source/NSArchiver.m Thu Oct 8 11:04:48 2015
@@ -310,7 +310,7 @@
case _C_ULNG_LNG: info = _GSC_ULNG_LNG | _GSC_S_LNG_LNG; break;
case _C_FLT: info = _GSC_FLT; break;
case _C_DBL: info = _GSC_DBL; break;
-#if __GNUC__ != 2
+#ifdef _C_BOOL
case _C_BOOL: info = _GSC_BOOL; break;
#endif
default: info = _GSC_NONE; break;
@@ -684,7 +684,7 @@
(*_serImp)(_dst, serSel, (void*)buf, @encode(double), nil);
return;
-#if __GNUC__ != 2
+#ifdef _C_BOOL
case _C_BOOL:
(*_tagImp)(_dst, tagSel, _GSC_BOOL);
(*_serImp)(_dst, serSel, (void*)buf, @encode(_Bool), nil);
Modified: libs/base/trunk/Source/NSData.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSData.m?rev=39041&r1=39040&r2=39041&view=diff
==============================================================================
--- libs/base/trunk/Source/NSData.m (original)
+++ libs/base/trunk/Source/NSData.m Thu Oct 8 11:04:48 2015
@@ -1385,7 +1385,7 @@
*(double*)data = NSSwapBigDoubleToHost(nd);
return;
}
-#if __GNUC__ != 2
+#ifdef _C_BOOL
case _C_BOOL:
{
[self deserializeBytes: data
@@ -2672,7 +2672,7 @@
[self appendBytes: &nd length: sizeof(NSSwappedDouble)];
return;
}
-#if __GNUC__ != 2
+#ifdef _C_BOOL
case _C_BOOL:
[self appendBytes: data length: sizeof(_Bool)];
return;
@@ -3159,7 +3159,7 @@
*(double*)data = NSSwapBigDoubleToHost(nd);
return;
}
-#if __GNUC__ != 2
+#ifdef _C_BOOL
case _C_BOOL:
{
getBytes(data, bytes, sizeof(_Bool), length, cursor);
@@ -4000,7 +4000,7 @@
(*appendImp)(self, appendSel, &nd, sizeof(NSSwappedDouble));
return;
}
-#if __GNUC__ != 2
+#ifdef _C_BOOL
case _C_BOOL:
(*appendImp)(self, appendSel, data, sizeof(_Bool));
return;
Modified: libs/base/trunk/Source/NSDecimalNumber.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSDecimalNumber.m?rev=39041&r1=39040&r2=39041&view=diff
==============================================================================
--- libs/base/trunk/Source/NSDecimalNumber.m (original)
+++ libs/base/trunk/Source/NSDecimalNumber.m Thu Oct 8 11:04:48 2015
@@ -324,7 +324,7 @@
llval = (long long)v;
break;
}
-#if __GNUC__ != 2
+#ifdef _C_BOOL
case _C_BOOL:
{
llval = (long long)((*(unsigned char *)value == 0) ? 0 : 1);
Modified: libs/base/trunk/Source/NSKeyValueObserving.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSKeyValueObserving.m?rev=39041&r1=39040&r2=39041&view=diff
==============================================================================
--- libs/base/trunk/Source/NSKeyValueObserving.m (original)
+++ libs/base/trunk/Source/NSKeyValueObserving.m Thu Oct 8 11:04:48 2015
@@ -573,7 +573,7 @@
imp = [[GSKVOSetter class]
instanceMethodForSelector: @selector(setterDouble:)];
break;
-#if __GNUC__ != 2
+#ifdef _C_BOOL
case _C_BOOL:
imp = [[GSKVOSetter class]
instanceMethodForSelector: @selector(setterChar:)];
Modified: libs/base/trunk/Source/NSKeyedArchiver.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSKeyedArchiver.m?rev=39041&r1=39040&r2=39041&view=diff
==============================================================================
--- libs/base/trunk/Source/NSKeyedArchiver.m (original)
+++ libs/base/trunk/Source/NSKeyedArchiver.m Thu Oct 8 11:04:48 2015
@@ -792,7 +792,7 @@
[_enc setObject: o forKey: aKey];
return;
-#if __GNUC__ != 2
+#ifdef _C_BOOL
case _C_BOOL:
o = [NSNumber numberWithInt: (NSInteger)*(_Bool*)address];
[_enc setObject: o forKey: aKey];
Modified: libs/base/trunk/Source/NSKeyedUnarchiver.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSKeyedUnarchiver.m?rev=39041&r1=39040&r2=39041&view=diff
==============================================================================
--- libs/base/trunk/Source/NSKeyedUnarchiver.m (original)
+++ libs/base/trunk/Source/NSKeyedUnarchiver.m Thu Oct 8 11:04:48 2015
@@ -748,7 +748,7 @@
*(double*)address = [o doubleValue];
return;
-#if __GNUC__ != 2
+#ifdef _C_BOOL
case _C_BOOL:
*(_Bool*)address = (_Bool)[o unsignedCharValue];
return;
Modified: libs/base/trunk/Source/NSMethodSignature.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSMethodSignature.m?rev=39041&r1=39040&r2=39041&view=diff
==============================================================================
--- libs/base/trunk/Source/NSMethodSignature.m (original)
+++ libs/base/trunk/Source/NSMethodSignature.m Thu Oct 8 11:04:48 2015
@@ -332,7 +332,7 @@
info->align = __alignof__(char*);
break;
-#if __GNUC__ != 2
+#ifdef _C_BOOL
case _C_BOOL:
info->size = sizeof(_Bool);
info->align = __alignof__(_Bool);
Modified: libs/base/trunk/Source/NSNumberFormatter.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSNumberFormatter.m?rev=39041&r1=39040&r2=39041&view=diff
==============================================================================
--- libs/base/trunk/Source/NSNumberFormatter.m (original)
+++ libs/base/trunk/Source/NSNumberFormatter.m Thu Oct 8 11:04:48 2015
@@ -1100,7 +1100,7 @@
* don't think it matters, because we don't bother with anything
* smaller than int for NSNumbers
*/
-#if defined(_C_BOOL)
+#ifdef _C_BOOL
case _C_BOOL:
STRING_FROM_NUMBER(unum_format, (int)[anObject boolValue]);
break;
Modified: libs/base/trunk/Source/NSPortCoder.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSPortCoder.m?rev=39041&r1=39040&r2=39041&view=diff
==============================================================================
--- libs/base/trunk/Source/NSPortCoder.m (original)
+++ libs/base/trunk/Source/NSPortCoder.m Thu Oct 8 11:04:48 2015
@@ -129,7 +129,9 @@
case _C_CHARPTR: return "cstring";
case _C_ARY_B: return "array";
case _C_STRUCT_B: return "struct";
+#ifdef _C_BOOL
case _C_BOOL: return "_Bool";
+#endif
default:
{
static char buf1[32];
@@ -220,7 +222,11 @@
#endif
_C_FLT,
_C_DBL,
+#ifdef _C_BOOL
_C_BOOL,
+#else
+ 0,
+#endif
0,
0,
_C_ID,
@@ -517,7 +523,9 @@
#endif
case _C_FLT: info = _GSC_FLT; break;
case _C_DBL: info = _GSC_DBL; break;
+#ifdef _C_BOOL
case _C_BOOL: info = _GSC_BOOL; break;
+#endif
default: info = _GSC_NONE; break;
}
@@ -1214,7 +1222,9 @@
case _C_ULNG_LNG: info = _GSC_ULNG_LNG | _GSC_S_LNG_LNG; break;
case _C_FLT: info = _GSC_FLT; break;
case _C_DBL: info = _GSC_DBL; break;
+#ifdef _C_BOOL
case _C_BOOL: info = _GSC_BOOL; break;
+#endif
default: info = _GSC_NONE; break;
}
@@ -1813,7 +1823,7 @@
(*_eSerImp)(_dst, eSerSel, (void*)buf, @encode(double), nil);
return;
-#if __GNUC__ != 2
+#ifdef _C_BOOL
case _C_BOOL:
(*_eTagImp)(_dst, eTagSel, _GSC_BOOL);
(*_eSerImp)(_dst, eSerSel, (void*)buf, @encode(_Bool), nil);
Modified: libs/base/trunk/Source/NSUnarchiver.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSUnarchiver.m?rev=39041&r1=39040&r2=39041&view=diff
==============================================================================
--- libs/base/trunk/Source/NSUnarchiver.m (original)
+++ libs/base/trunk/Source/NSUnarchiver.m Thu Oct 8 11:04:48 2015
@@ -78,7 +78,9 @@
case _C_ULNG_LNG: return "unsigned long long";
case _C_FLT: return "float";
case _C_DBL: return "double";
+#ifdef _C_BOOL
case _C_BOOL: return "_Bool";
+#endif
case _C_PTR: return "pointer";
case _C_CHARPTR: return "cstring";
case _C_ARY_B: return "array";
@@ -168,7 +170,11 @@
_C_ULNG_LNG,
_C_FLT,
_C_DBL,
+#ifdef _C_BOOL
_C_BOOL,
+#else
+ 0,
+#endif
0,
0,
_C_ID,
@@ -610,7 +616,9 @@
case _C_ULNG_LNG: info = _GSC_ULNG_LNG; break;
case _C_FLT: info = _GSC_FLT; break;
case _C_DBL: info = _GSC_DBL; break;
+#ifdef _C_BOOL
case _C_BOOL: info = _GSC_BOOL; break;
+#endif
default: info = _GSC_NONE; break;
}
Modified: libs/base/trunk/Source/cifframe.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/cifframe.m?rev=39041&r1=39040&r2=39041&view=diff
==============================================================================
--- libs/base/trunk/Source/cifframe.m (original)
+++ libs/base/trunk/Source/cifframe.m Thu Oct 8 11:04:48 2015
@@ -540,7 +540,7 @@
case _C_VOID: ftype = &ffi_type_void;
break;
-#if __GNUC__ != 2
+#if __GNUC__ != 2 && defined(_C_BOOL)
case _C_BOOL: ftype = &ffi_type_uchar;
break;
#endif
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
