From: Matthew Jordan <mjordan@digium.com>
Date: Wed, 11 Jul 2012 19:44:51 +0000 (+0000)
Subject: Fix bad merge of r368759 in sig_analog
X-Git-Tag: certified/1.8.11-cert5-rc2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74d6d1f67a47153f69e8eb4486cd9e6d3b50ff49;p=thirdparty%2Fasterisk.git

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)


git-svn-id: https://origsvn.digium.com/svn/asterisk/certified/branches/1.8.11@369964 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/sig_analog.c b/channels/sig_analog.c
index aefe703a3d..779d5acbd2 100644
--- a/channels/sig_analog.c
+++ b/channels/sig_analog.c
@@ -535,23 +535,19 @@ static void analog_all_subchannels_hungup(struct analog_pvt *p)
 	}
 }
 
-#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