cml/libcm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmDspClass.c: Removed use of OS_OSX preproc. flags for working around

Browse Source 
va_list differences with older gcc. This change is part of spat-lab port.
This commit is contained in:
kevin 2013-09-05 15:58:41 -07:00
parent a204e9ad1c
commit 2d85218c4b
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dsp/cmDspClass.c
View File

@ -250,11 +250,7 @@ void* cmDspInstAllocate(
return p; return p;
} }
#ifdef OS_OSX
va_list _cmDspParseArgV( cmDspVarArg_t* a, va_list vl )
#else
void _cmDspParseArgV( cmDspVarArg_t* a, va_list vl ) void _cmDspParseArgV( cmDspVarArg_t* a, va_list vl )
#endif
{ {
a->label = va_arg(vl,const char*); a->label = va_arg(vl,const char*);
a->constId = va_arg(vl,unsigned); 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->cn = va_arg(vl,unsigned);
a->flags = va_arg(vl,unsigned); a->flags = va_arg(vl,unsigned);
a->doc = va_arg(vl,const char*); 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, ... ) void* cmDspInstAllocateV(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned instByteCnt, unsigned instSymId, unsigned instId, unsigned storeSymId, unsigned va_cnt, va_list vl0, ... )
@ -285,9 +278,6 @@ void* cmDspInstAllocateV(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned instB
argCnt += repeatCnt; argCnt += repeatCnt;
#ifdef OS_OSX
vl1 =
#endif
_cmDspParseArgV(&a,vl1); _cmDspParseArgV(&a,vl1);
} }
@ -297,9 +287,6 @@ void* cmDspInstAllocateV(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned instB
{ {
cmDspVarArg_t a; 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 ); cmDspArgSetupN(ctx,aa,argCnt,j,repeatCnt,a.label,a.constId,a.rn, a.cn, a.flags, a.doc );