[asterisk-commits] rmudgett: trunk r309127 - in /trunk: ./ channels/sig_analog.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Mar  1 12:50:07 2011
New Revision: 309127

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=309127
Log:
Merged revisions 309126 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r309126 | rmudgett | 2011-03-01 12:44:05 -0600 (Tue, 01 Mar 2011) | 16 lines
  
  Chan_dahdi does not retain CID when detecting DTMF CID without polarity reversal.
  
  Looks like an unintended change when sig_analog.c was extracted from
  chan_dahdi.c.
  
  Removed useless conditional around needed code and fixed resulting
  compiler warning.
  
  (closes issue #18667)
  Reported by: enegaard
  Patches:
        issue18667.patch uploaded by enegaard (license 1197)
  Tested by: enegaard
  
  JIRA SWP-2965
........

Modified:
    trunk/   (props changed)
    trunk/channels/sig_analog.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/sig_analog.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_analog.c?view=diff&rev=309127&r1=309126&r2=309127
==============================================================================
--- trunk/channels/sig_analog.c (original)
+++ trunk/channels/sig_analog.c Tue Mar  1 12:50:07 2011
@@ -3019,7 +3019,6 @@
 			break;
 		}
 		break;
-#ifdef ANALOG_EVENT_RINGBEGIN
 	case ANALOG_EVENT_RINGBEGIN:
 		switch (p->sig) {
 		case ANALOG_SIG_FXSLS:
@@ -3029,9 +3028,10 @@
 				analog_set_ringtimeout(p, p->ringt_base);
 			}
 			break;
-		}
-		break;
-#endif
+		default:
+			break;
+		}
+		break;
 	case ANALOG_EVENT_RINGEROFF:
 		if (p->inalarm) break;
 		ast->rings++;