Version 0.1.11 from FTP

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

1 files changed, 4 insertions, 4 deletions

diff --git a/include/asterisk/callerid.h b/include/asterisk/callerid.h
index 079a839f9..6d77e19ce 100755
--- 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);