Merge from 0.6.5

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@6040 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2000-02-19 00:40:47 +00:00
parent 5276d1b6c2
commit fb65f2b8b6
36 changed files with 1074 additions and 479 deletions

View file

@ -205,10 +205,8 @@ static SEL eValSel = @selector(encodeValueOfObjCType:at:);
case _C_UINT: info = _GSC_UINT | _GSC_S_INT; break;
case _C_LNG: info = _GSC_LNG | _GSC_S_LNG; break;
case _C_ULNG: info = _GSC_ULNG | _GSC_S_LNG; break;
#ifdef _C_LNG_LNG
case _C_LNG_LNG: info = _GSC_LNG_LNG | _GSC_S_LNG_LNG; break;
case _C_ULNG_LNG: info = _GSC_ULNG_LNG | _GSC_S_LNG_LNG; break;
#endif
case _C_FLT: info = _GSC_FLT; break;
case _C_DBL: info = _GSC_DBL; break;
default: info = _GSC_NONE; break;
@ -537,7 +535,6 @@ static SEL eValSel = @selector(encodeValueOfObjCType:at:);
(*_serImp)(_dst, serSel, (void*)buf, @encode(unsigned long), nil);
return;
#ifdef _C_LNG_LNG
case _C_LNG_LNG:
(*_tagImp)(_dst, tagSel, _GSC_LNG_LNG | _GSC_S_LNG_LNG);
(*_serImp)(_dst, serSel, (void*)buf, @encode(long long), nil);
@ -548,7 +545,6 @@ static SEL eValSel = @selector(encodeValueOfObjCType:at:);
(*_serImp)(_dst, serSel, (void*)buf, @encode(unsigned long long), nil);
return;
#endif
case _C_FLT:
(*_tagImp)(_dst, tagSel, _GSC_FLT);
(*_serImp)(_dst, serSel, (void*)buf, @encode(float), nil);