From 2d85218c4b065830f6a0beb8d136ea33a3135f8e Mon Sep 17 00:00:00 2001
From: kevin <kevin@octo.ucsd.edu>
Date: Thu, 5 Sep 2013 15:58:41 -0700
Subject: [PATCH] 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.

---
 dsp/cmDspClass.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/dsp/cmDspClass.c b/dsp/cmDspClass.c
index 0b35782..0f77cdc 100644
--- a/dsp/cmDspClass.c
+++ b/dsp/cmDspClass.c
@@ -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;