From: Olle Johansson <oej@edvina.net>
Date: Wed, 27 Dec 2006 21:27:57 +0000 (+0000)
Subject: Only include include files once (imported from 1.4)
X-Git-Tag: 1.6.0-beta1~3^2~3620
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b54feaffece20625ac28ed0f0211b2ed95f3ca28;p=thirdparty%2Fasterisk.git

Only include include files once (imported from 1.4)


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index af3caa2f9f..651ad0d040 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -113,7 +113,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
-#include "asterisk/lock.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"
@@ -126,7 +125,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/musiconhold.h"
 #include "asterisk/dsp.h"
 #include "asterisk/features.h"
-#include "asterisk/acl.h"
 #include "asterisk/srv.h"
 #include "asterisk/astdb.h"
 #include "asterisk/causes.h"