From e052947f18a9b2e30ba1ef4db56a08aba8688bc2 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Wed, 23 May 2012 01:52:39 -0400
Subject: [PATCH] Use 'frame' instead of 'signal', take out stdlib.h in silk/.

On MacOS, stdlib.h ends up including sys/signal.h, generating
warnings about the local variables called 'signal' shadowing
the global symbol signal(3).

This was originally done in 86476906 but it missed some use
of 'signal' in prototypes in headers where it didn't cause
warnings. Later the prototypes were moved around and the
warnings came back.

This also cleans up some cases in where stdlib.h was used
but shouldn't be required.
---
 silk/MacroCount.h  | 2 +-
 silk/MacroDebug.h  | 2 +-
 silk/PLC.c         | 2 +-
 silk/SigProc_FIX.h | 1 -
 silk/VAD.c         | 1 -
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/silk/MacroCount.h b/silk/MacroCount.h
index 584f4b7b..2829e8cc 100644
--- a/silk/MacroCount.h
+++ b/silk/MacroCount.h
@@ -477,7 +477,7 @@ static inline opus_int64 silk_abs_int64(opus_int64 a){
 #undef    silk_abs_int32
 static inline opus_int32 silk_abs_int32(opus_int32 a){
     ops_count += 1;
-    return abs(a);
+    return silk_abs(a);
 }
 
 
diff --git a/silk/MacroDebug.h b/silk/MacroDebug.h
index 7dcd187e..ecd90bc4 100644
--- a/silk/MacroDebug.h
+++ b/silk/MacroDebug.h
@@ -893,7 +893,7 @@ static inline opus_int32 silk_abs_int32_(opus_int32 a, char *file, int line){
         silk_assert( 0 );
 #endif
     }
-    return abs(a);
+    return silk_abs(a);
 }
 
 #undef silk_CHECK_FIT8
diff --git a/silk/PLC.c b/silk/PLC.c
index 2d053545..1b93d06e 100644
--- a/silk/PLC.c
+++ b/silk/PLC.c
@@ -45,7 +45,7 @@ static inline void silk_PLC_update(
 static inline void silk_PLC_conceal(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl,         /* I/O Decoder control      */
-    opus_int16                          signal[]            /* O LPC residual signal    */
+    opus_int16                          frame[]             /* O LPC residual signal    */
 );
 
 
diff --git a/silk/SigProc_FIX.h b/silk/SigProc_FIX.h
index ab9c3609..72ec26a6 100644
--- a/silk/SigProc_FIX.h
+++ b/silk/SigProc_FIX.h
@@ -37,7 +37,6 @@ extern "C"
 
 #define SILK_MAX_ORDER_LPC            16            /* max order of the LPC analysis in schur() and k2a() */
 
-#include <stdlib.h>                                 /* for abs() */
 #include <string.h>                                 /* for memset(), memcpy(), memmove() */
 #include "typedef.h"
 #include "resampler_structs.h"
diff --git a/silk/VAD.c b/silk/VAD.c
index 8c8a3a4d..bac89b44 100644
--- a/silk/VAD.c
+++ b/silk/VAD.c
@@ -29,7 +29,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include <stdlib.h>
 #include "main.h"
 
 /* Silk VAD noise level estimation */