[Asterisk-Dev] Duplicate symbol

[Thorsten Lockert]

On some systems all loaded modules will have their symbols in
global context, and there is no RTLD_GLOBAL flag.

On these, iLBC and MP3 codecs have conflicting versions of the
routine window().  This patch renames the one in iLBC.

Index: LPCencode.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/LPCencode.c,v
retrieving revision 1.1
diff -u -r1.1 LPCencode.c
--- LPCencode.c	15 Apr 2003 04:36:52 -0000	1.1
+++ LPCencode.c	23 Apr 2003 13:22:44 -0000
@@ -41,13 +41,13 @@
         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); 
Index: helpfun.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/helpfun.c,v
retrieving revision 1.1
diff -u -r1.1 helpfun.c
--- helpfun.c	15 Apr 2003 04:36:52 -0000	1.1
+++ helpfun.c	23 Apr 2003 13:22:44 -0000
@@ -42,7 +42,7 @@
  *  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 */ 
Index: helpfun.h
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/helpfun.h,v
retrieving revision 1.1
diff -u -r1.1 helpfun.h
--- helpfun.h	15 Apr 2003 04:36:52 -0000	1.1
+++ helpfun.h	23 Apr 2003 13:22:44 -0000
@@ -21,7 +21,7 @@
     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 */ 
--
Thorsten Lockert      | tholo at sigmasoft.com | Universe, n.:
2121 N. Lakeshore Dr. | tholo at openbsd.org   |         The problem.
Chapel Hill, NC 27514 |                     |