mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 00:41:02 +00:00
Enable _C_BOOL on non GNU C compilers
This commit is contained in:
parent
852ec7be7d
commit
40f88bc622
14 changed files with 30 additions and 30 deletions
|
@ -1088,7 +1088,7 @@ GSObjCGetVal(NSObject *self, const char *key, SEL sel,
|
|||
}
|
||||
break;
|
||||
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL:
|
||||
{
|
||||
_Bool v;
|
||||
|
@ -1553,7 +1553,7 @@ GSObjCSetVal(NSObject *self, const char *key, id val, SEL sel,
|
|||
}
|
||||
break;
|
||||
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL:
|
||||
{
|
||||
_Bool v = (_Bool)[val boolValue];
|
||||
|
@ -2212,7 +2212,7 @@ GSObjCPrint(void *base, void *item)
|
|||
}
|
||||
break;
|
||||
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL:
|
||||
{
|
||||
_Bool v = *(_Bool *)((char *)o + offset);
|
||||
|
|
|
@ -422,7 +422,7 @@ gs_sel_type_to_callback_type (const char *sel_type,
|
|||
case _C_DBL:
|
||||
vatype->type = __VAdouble;
|
||||
break;
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL:
|
||||
vatype->type = __VAuchar;
|
||||
break;
|
||||
|
@ -611,7 +611,7 @@ GSFFCallInvokeWithTargetAndImp(NSInvocation *_inv, id anObject, IMP imp)
|
|||
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 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
CASE_TYPE(_C_BOOL, _Bool, av_start_uchar)
|
||||
#endif
|
||||
|
||||
|
@ -716,7 +716,7 @@ GSFFCallInvokeWithTargetAndImp(NSInvocation *_inv, id anObject, IMP imp)
|
|||
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 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
CASE_TYPE(_C_BOOL, _Bool, av_uchar)
|
||||
#endif
|
||||
|
||||
|
@ -1054,7 +1054,7 @@ GSInvocationCallback (void *callback_data, va_alist args)
|
|||
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 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
CASE_TYPE(_C_BOOL, _Bool, va_arg_uchar)
|
||||
#endif
|
||||
|
||||
|
@ -1117,7 +1117,7 @@ GSInvocationCallback (void *callback_data, va_alist args)
|
|||
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 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
CASE_TYPE(_C_BOOL, _Bool, va_return_uchar)
|
||||
#endif
|
||||
|
||||
|
|
|
@ -61,7 +61,7 @@ typeSize(const char* type)
|
|||
case _C_ULNG_LNG: return sizeof(unsigned long long);
|
||||
case _C_FLT: return sizeof(float);
|
||||
case _C_DBL: return sizeof(double);
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL: return sizeof(_Bool);
|
||||
#endif
|
||||
case _C_PTR: return sizeof(void*);
|
||||
|
|
|
@ -298,7 +298,7 @@ static Class NSMutableDataMallocClass;
|
|||
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 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL: info = _GSC_BOOL; break;
|
||||
#endif
|
||||
default: info = _GSC_NONE; break;
|
||||
|
@ -672,7 +672,7 @@ static Class NSMutableDataMallocClass;
|
|||
(*_serImp)(_dst, serSel, (void*)buf, @encode(double), nil);
|
||||
return;
|
||||
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL:
|
||||
(*_tagImp)(_dst, tagSel, _GSC_BOOL);
|
||||
(*_serImp)(_dst, serSel, (void*)buf, @encode(_Bool), nil);
|
||||
|
|
|
@ -1528,7 +1528,7 @@ failure:
|
|||
*(double*)data = NSSwapBigDoubleToHost(nd);
|
||||
return;
|
||||
}
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL:
|
||||
{
|
||||
[self deserializeBytes: data
|
||||
|
@ -2841,7 +2841,7 @@ failure:
|
|||
[self appendBytes: &nd length: sizeof(NSSwappedDouble)];
|
||||
return;
|
||||
}
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL:
|
||||
[self appendBytes: data length: sizeof(_Bool)];
|
||||
return;
|
||||
|
@ -3320,7 +3320,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
|
|||
*(double*)data = NSSwapBigDoubleToHost(nd);
|
||||
return;
|
||||
}
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL:
|
||||
{
|
||||
getBytes(data, bytes, sizeof(_Bool), length, cursor);
|
||||
|
@ -4201,7 +4201,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
|
|||
(*appendImp)(self, appendSel, &nd, sizeof(NSSwappedDouble));
|
||||
return;
|
||||
}
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL:
|
||||
(*appendImp)(self, appendSel, data, sizeof(_Bool));
|
||||
return;
|
||||
|
|
|
@ -324,7 +324,7 @@ static NSDecimalNumber *one;
|
|||
llval = (long long)v;
|
||||
break;
|
||||
}
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL:
|
||||
{
|
||||
llval = (long long)((*(unsigned char *)value == 0) ? 0 : 1);
|
||||
|
|
|
@ -573,7 +573,7 @@ cifframe_callback(ffi_cif *cif, void *retp, void **args, void *user)
|
|||
imp = [[GSKVOSetter class]
|
||||
instanceMethodForSelector: @selector(setterDouble:)];
|
||||
break;
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL:
|
||||
imp = [[GSKVOSetter class]
|
||||
instanceMethodForSelector: @selector(setterChar:)];
|
||||
|
|
|
@ -791,7 +791,7 @@ static NSDictionary *makeReference(unsigned ref)
|
|||
[_enc setObject: o forKey: aKey];
|
||||
return;
|
||||
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL:
|
||||
o = [NSNumber numberWithInt: (NSInteger)*(_Bool*)address];
|
||||
[_enc setObject: o forKey: aKey];
|
||||
|
|
|
@ -752,7 +752,7 @@ static NSMapTable *globalClassMap = 0;
|
|||
*(double*)address = [o doubleValue];
|
||||
return;
|
||||
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL:
|
||||
*(_Bool*)address = (_Bool)[o unsignedCharValue];
|
||||
return;
|
||||
|
|
|
@ -332,7 +332,7 @@ next_arg(const char *typePtr, NSArgumentInfo *info, char *outTypes)
|
|||
info->align = __alignof__(char*);
|
||||
break;
|
||||
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL:
|
||||
info->size = sizeof(_Bool);
|
||||
info->align = __alignof__(_Bool);
|
||||
|
|
|
@ -1103,7 +1103,7 @@ static NSUInteger _defaultBehavior = NSNumberFormatterBehavior10_4;
|
|||
* don't think it matters, because we don't bother with anything
|
||||
* smaller than int for NSNumbers
|
||||
*/
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL:
|
||||
STRING_FROM_NUMBER(unum_format, (int)[anObject boolValue]);
|
||||
break;
|
||||
|
|
|
@ -122,7 +122,7 @@ typeToName1(char type)
|
|||
case _C_CHARPTR: return "cstring";
|
||||
case _C_ARY_B: return "array";
|
||||
case _C_STRUCT_B: return "struct";
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL: return "_Bool";
|
||||
#endif
|
||||
default:
|
||||
|
@ -215,7 +215,7 @@ static char type_map[32] = {
|
|||
#endif
|
||||
_C_FLT,
|
||||
_C_DBL,
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
_C_BOOL,
|
||||
#else
|
||||
0,
|
||||
|
@ -508,7 +508,7 @@ static unsigned encodingVersion;
|
|||
#endif
|
||||
case _C_FLT: info = _GSC_FLT; break;
|
||||
case _C_DBL: info = _GSC_DBL; break;
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL: info = _GSC_BOOL; break;
|
||||
#endif
|
||||
default: info = _GSC_NONE; break;
|
||||
|
@ -1296,7 +1296,7 @@ scalarSize(char type)
|
|||
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 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL: info = _GSC_BOOL; break;
|
||||
#endif
|
||||
default: info = _GSC_NONE; break;
|
||||
|
@ -1897,7 +1897,7 @@ scalarSize(char type)
|
|||
(*_eSerImp)(_dst, eSerSel, (void*)buf, @encode(double), nil);
|
||||
return;
|
||||
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL:
|
||||
(*_eTagImp)(_dst, eTagSel, _GSC_BOOL);
|
||||
(*_eSerImp)(_dst, eSerSel, (void*)buf, @encode(_Bool), nil);
|
||||
|
|
|
@ -78,7 +78,7 @@ typeToName1(char type)
|
|||
case _C_ULNG_LNG: return "unsigned long long";
|
||||
case _C_FLT: return "float";
|
||||
case _C_DBL: return "double";
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL: return "_Bool";
|
||||
#endif
|
||||
case _C_PTR: return "pointer";
|
||||
|
@ -170,7 +170,7 @@ static char type_map[32] = {
|
|||
_C_ULNG_LNG,
|
||||
_C_FLT,
|
||||
_C_DBL,
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
_C_BOOL,
|
||||
#else
|
||||
0,
|
||||
|
@ -616,7 +616,7 @@ static unsigned encodingVersion;
|
|||
case _C_ULNG_LNG: info = _GSC_ULNG_LNG; break;
|
||||
case _C_FLT: info = _GSC_FLT; break;
|
||||
case _C_DBL: info = _GSC_DBL; break;
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL: info = _GSC_BOOL; break;
|
||||
#endif
|
||||
default: info = _GSC_NONE; break;
|
||||
|
|
|
@ -532,7 +532,7 @@ cifframe_type(const char *typePtr, const char **advance)
|
|||
|
||||
case _C_VOID: ftype = &ffi_type_void;
|
||||
break;
|
||||
#if __GNUC__ > 2 && defined(_C_BOOL)
|
||||
#if defined(_C_BOOL) && (!defined(__GNUC__) || __GNUC__ > 2)
|
||||
case _C_BOOL: ftype = &ffi_type_uchar;
|
||||
break;
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue