Version 0.1.11 from FTP

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@407 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/callerid.c b/callerid.c
index a3d9f42f1ea7b4b27ba9cf3f65c6c974d93bc13c..e8688fb7f0c32407d8960975a2f77d189932cef5 100755 (executable)
--- a/callerid.c
+++ b/callerid.c
@@ -43,7 +43,8 @@ struct callerid_state {
        int len;
 };
 
-float dr[4], di[4];
+
+float cid_dr[4], cid_di[4];
 float clidsb = 8000.0 / 1200.0;
 
 #define CALLERID_SPACE 2200.0          /* 2200 hz for "0" */
@@ -52,10 +53,10 @@ float clidsb = 8000.0 / 1200.0;
 void callerid_init(void)
 {
        /* Initialize stuff for inverse FFT */
-       dr[0] = cos(CALLERID_SPACE * 2.0 * M_PI / 8000.0);
-       di[0] = sin(CALLERID_SPACE * 2.0 * M_PI / 8000.0);
-       dr[1] = cos(CALLERID_MARK * 2.0 * M_PI / 8000.0);
-       di[1] = sin(CALLERID_MARK * 2.0 * M_PI / 8000.0);
+       cid_dr[0] = cos(CALLERID_SPACE * 2.0 * M_PI / 8000.0);
+       cid_di[0] = sin(CALLERID_SPACE * 2.0 * M_PI / 8000.0);
+       cid_dr[1] = cos(CALLERID_MARK * 2.0 * M_PI / 8000.0);
+       cid_di[1] = sin(CALLERID_MARK * 2.0 * M_PI / 8000.0);
 }
 
 struct callerid_state *callerid_new(void)

diff --git a/include/asterisk/callerid.h b/include/asterisk/callerid.h
index 079a839f9e7c59b9664f65fc1c2c5a6600929548..6d77e19ceb50546b283e2836eba199ec5a925c1e 100755 (executable)
--- a/include/asterisk/callerid.h
+++ b/include/asterisk/callerid.h
@@ -139,16 +139,16 @@ extern int ast_isphonenumber(char *n);
  * routines (used by ADSI for example)
  */
 
-extern float dr[4];
-extern float di[4];
+extern float cid_dr[4];
+extern float cid_di[4];
 extern float clidsb;
 
 static inline float callerid_getcarrier(float *cr, float *ci, int bit)
 {
        /* Move along.  There's nothing to see here... */
        float t;
-       t = *cr * dr[bit] - *ci * di[bit];
-       *ci = *cr * di[bit] + *ci * dr[bit];
+       t = *cr * cid_dr[bit] - *ci * cid_di[bit];
+       *ci = *cr * cid_di[bit] + *ci * cid_dr[bit];
        *cr = t;
        
        t = 2.0 - (*cr * *cr + *ci * *ci);