|
@@ -250,11 +250,7 @@ void* cmDspInstAllocate(
|
250
|
250
|
return p;
|
251
|
251
|
}
|
252
|
252
|
|
253
|
|
-#ifdef OS_OSX
|
254
|
|
-va_list _cmDspParseArgV( cmDspVarArg_t* a, va_list vl )
|
255
|
|
-#else
|
256
|
253
|
void _cmDspParseArgV( cmDspVarArg_t* a, va_list vl )
|
257
|
|
-#endif
|
258
|
254
|
{
|
259
|
255
|
a->label = va_arg(vl,const char*);
|
260
|
256
|
a->constId = va_arg(vl,unsigned);
|
|
@@ -262,9 +258,6 @@ void _cmDspParseArgV( cmDspVarArg_t* a, va_list vl )
|
262
|
258
|
a->cn = va_arg(vl,unsigned);
|
263
|
259
|
a->flags = va_arg(vl,unsigned);
|
264
|
260
|
a->doc = va_arg(vl,const char*);
|
265
|
|
-#ifdef OS_OSX
|
266
|
|
- return vl;
|
267
|
|
-#endif
|
268
|
261
|
}
|
269
|
262
|
|
270
|
263
|
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
|
285
|
278
|
|
286
|
279
|
argCnt += repeatCnt;
|
287
|
280
|
|
288
|
|
-#ifdef OS_OSX
|
289
|
|
- vl1 =
|
290
|
|
-#endif
|
291
|
|
- _cmDspParseArgV(&a,vl1);
|
|
281
|
+ _cmDspParseArgV(&a,vl1);
|
292
|
282
|
}
|
293
|
283
|
|
294
|
284
|
cmDspVarArg_t aa[ argCnt+1 ];
|
|
@@ -297,10 +287,7 @@ void* cmDspInstAllocateV(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned instB
|
297
|
287
|
{
|
298
|
288
|
cmDspVarArg_t a;
|
299
|
289
|
|
300
|
|
-#ifdef OS_OSX
|
301
|
|
- vl2 =
|
302
|
|
-#endif
|
303
|
|
- _cmDspParseArgV(&a,vl2);
|
|
290
|
+ _cmDspParseArgV(&a,vl2);
|
304
|
291
|
|
305
|
292
|
cmDspArgSetupN(ctx,aa,argCnt,j,repeatCnt,a.label,a.constId,a.rn, a.cn, a.flags, a.doc );
|
306
|
293
|
j += repeatCnt;
|