[asterisk-commits] mjordan: branch certified-1.8.11 r369964 - /certified/branches/1.8.11/channels/

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Jul 11 14:44:51 2012
New Revision: 369964

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369964
Log:
Fix bad merge of r368759 in sig_analog

The patch for r368759 in Asterisk 1.8 relied upon the methods
analog_unlock_private/analog_lock_private.  In earlier versions of 1.8,
including the Certified Asterisk 1.8.11 branch, those two methods were
unused, and hence were undefined out of the source.  When the patch was made
for 1.8.11-cert5, those two functions were not re-defined back in.  This caused
linking errors when sig_analog was loaded.

This patch properly restores those two methods, such that the fix for AST-891
works correctly.

(issue AST-891)

Modified:
    certified/branches/1.8.11/channels/sig_analog.c

Modified: certified/branches/1.8.11/channels/sig_analog.c
URL: http://svnview.digium.com/svn/asterisk/certified/branches/1.8.11/channels/sig_analog.c?view=diff&rev=369964&r1=369963&r2=369964
==============================================================================
--- certified/branches/1.8.11/channels/sig_analog.c (original)
+++ certified/branches/1.8.11/channels/sig_analog.c Wed Jul 11 14:44:51 2012
@@ -535,23 +535,19 @@
 	}
 }
 
-#if 0
 static void analog_unlock_private(struct analog_pvt *p)
 {
 	if (p->calls->unlock_private) {
 		p->calls->unlock_private(p->chan_pvt);
 	}
 }
-#endif
-
-#if 0
+
 static void analog_lock_private(struct analog_pvt *p)
 {
 	if (p->calls->lock_private) {
 		p->calls->lock_private(p->chan_pvt);
 	}
 }
-#endif
 
 /*!
  * \internal