cmDspClass.c: Removed use of OS_OSX preproc. flags for working around
va_list differences with older gcc. This change is part of spat-lab port.
This commit is contained in:
parent
a204e9ad1c
commit
2d85218c4b
@ -250,11 +250,7 @@ void* cmDspInstAllocate(
|
||||
return p;
|
||||
}
|
||||
|
||||
#ifdef OS_OSX
|
||||
va_list _cmDspParseArgV( cmDspVarArg_t* a, va_list vl )
|
||||
#else
|
||||
void _cmDspParseArgV( cmDspVarArg_t* a, va_list vl )
|
||||
#endif
|
||||
{
|
||||
a->label = va_arg(vl,const char*);
|
||||
a->constId = va_arg(vl,unsigned);
|
||||
@ -262,9 +258,6 @@ void _cmDspParseArgV( cmDspVarArg_t* a, va_list vl )
|
||||
a->cn = va_arg(vl,unsigned);
|
||||
a->flags = va_arg(vl,unsigned);
|
||||
a->doc = va_arg(vl,const char*);
|
||||
#ifdef OS_OSX
|
||||
return vl;
|
||||
#endif
|
||||
}
|
||||
|
||||
void* cmDspInstAllocateV(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned instByteCnt, unsigned instSymId, unsigned instId, unsigned storeSymId, unsigned va_cnt, va_list vl0, ... )
|
||||
@ -285,10 +278,7 @@ void* cmDspInstAllocateV(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned instB
|
||||
|
||||
argCnt += repeatCnt;
|
||||
|
||||
#ifdef OS_OSX
|
||||
vl1 =
|
||||
#endif
|
||||
_cmDspParseArgV(&a,vl1);
|
||||
_cmDspParseArgV(&a,vl1);
|
||||
}
|
||||
|
||||
cmDspVarArg_t aa[ argCnt+1 ];
|
||||
@ -297,10 +287,7 @@ void* cmDspInstAllocateV(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned instB
|
||||
{
|
||||
cmDspVarArg_t a;
|
||||
|
||||
#ifdef OS_OSX
|
||||
vl2 =
|
||||
#endif
|
||||
_cmDspParseArgV(&a,vl2);
|
||||
_cmDspParseArgV(&a,vl2);
|
||||
|
||||
cmDspArgSetupN(ctx,aa,argCnt,j,repeatCnt,a.label,a.constId,a.rn, a.cn, a.flags, a.doc );
|
||||
j += repeatCnt;
|
||||
|
Loading…
Reference in New Issue
Block a user