Fix some symbol and Makefile issues

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@886 f38db490-d61c-443f-a65b-d21fe96a405b

3 files changed, 5 insertions, 5 deletions

diff --git a/codecs/ilbc/LPCencode.c b/codecs/ilbc/LPCencode.c
index 330796d7b..251cd3fe5 100755
--- a/codecs/ilbc/LPCencode.c
+++ b/codecs/ilbc/LPCencode.c
@@ -41,13 +41,13 @@ void SimpleAnalysis(
         is = LPC_LOOKBACK; 
  
         if (k < (LPC_N - 1)) { 
-            window(temp, lpc_winTbl, lpc_buffer, BLOCKL); 
+            lbc_window(temp, lpc_winTbl, lpc_buffer, BLOCKL); 
         } else { 
-            window(temp, lpc_asymwinTbl, lpc_buffer + is, BLOCKL); 
+            lbc_window(temp, lpc_asymwinTbl, lpc_buffer + is, BLOCKL); 
         } 
          
         autocorr(r, temp, BLOCKL, LPC_FILTERORDER); 
-        window(r, r, lpc_lagwinTbl, LPC_FILTERORDER + 1); 
+        lbc_window(r, r, lpc_lagwinTbl, LPC_FILTERORDER + 1); 
          
         levdurb(lp, temp, r, LPC_FILTERORDER); 
         bwexpand(lp2, lp, LPC_CHIRP_SYNTDENUM, LPC_FILTERORDER+1); 
diff --git a/codecs/ilbc/helpfun.c b/codecs/ilbc/helpfun.c
index 8788e7894..936afd614 100755
--- a/codecs/ilbc/helpfun.c
+++ b/codecs/ilbc/helpfun.c
@@ -42,7 +42,7 @@ void autocorr(
  *  window multiplication   
  *---------------------------------------------------------------*/ 
  
-void window(  
+void lbc_window(  
     float *z,       /* (o) the windowed data */ 
     const float *x, /* (i) the original data vector */ 
     const float *y, /* (i) the window */ 
diff --git a/codecs/ilbc/helpfun.h b/codecs/ilbc/helpfun.h
index be6e727b7..01edc876b 100755
--- a/codecs/ilbc/helpfun.h
+++ b/codecs/ilbc/helpfun.h
@@ -21,7 +21,7 @@ void autocorr(
     int order       /* largest lag for calculated autocorrelations */ 
 ); 
  
-void window(  
+void lbc_window(  
     float *z,       /* (o) the windowed data */ 
     const float *x, /* (i) the original data vector */ 
     const float *y, /* (i) the window */