Browse Source

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.
master
kevin 10 years ago
parent
commit
2d85218c4b
1 changed files with 2 additions and 15 deletions
  1. 2
    15
      dsp/cmDspClass.c

+ 2
- 15
dsp/cmDspClass.c View File

250
   return p;
250
   return p;
251
 }
251
 }
252
 
252
 
253
-#ifdef OS_OSX
254
-va_list  _cmDspParseArgV( cmDspVarArg_t* a, va_list vl )
255
-#else
256
 void  _cmDspParseArgV( cmDspVarArg_t* a, va_list vl )
253
 void  _cmDspParseArgV( cmDspVarArg_t* a, va_list vl )
257
-#endif
258
 {
254
 {
259
   a->label   = va_arg(vl,const char*);
255
   a->label   = va_arg(vl,const char*);
260
   a->constId = va_arg(vl,unsigned);
256
   a->constId = va_arg(vl,unsigned);
262
   a->cn      = va_arg(vl,unsigned);
258
   a->cn      = va_arg(vl,unsigned);
263
   a->flags   = va_arg(vl,unsigned);
259
   a->flags   = va_arg(vl,unsigned);
264
   a->doc     = va_arg(vl,const char*);  
260
   a->doc     = va_arg(vl,const char*);  
265
-#ifdef OS_OSX
266
-  return vl;
267
-#endif
268
 }
261
 }
269
 
262
 
270
 void* cmDspInstAllocateV(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned instByteCnt, unsigned instSymId, unsigned instId, unsigned storeSymId, unsigned va_cnt, va_list vl0, ... )
263
 void* cmDspInstAllocateV(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned instByteCnt, unsigned instSymId, unsigned instId, unsigned storeSymId, unsigned va_cnt, va_list vl0, ... )
285
     
278
     
286
     argCnt += repeatCnt;
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
   cmDspVarArg_t aa[ argCnt+1 ];
284
   cmDspVarArg_t aa[ argCnt+1 ];
297
   {
287
   {
298
     cmDspVarArg_t a;
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
     cmDspArgSetupN(ctx,aa,argCnt,j,repeatCnt,a.label,a.constId,a.rn, a.cn, a.flags, a.doc ); 
292
     cmDspArgSetupN(ctx,aa,argCnt,j,repeatCnt,a.label,a.constId,a.rn, a.cn, a.flags, a.doc ); 
306
     j += repeatCnt;
293
     j += repeatCnt;

Loading…
Cancel
Save