From 414106a3a6f5cb0de8c3c0ca494a5a847d6aeafa Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 31 May 2006 17:29:12 +0000
Subject: [PATCH] move the includes of abstract_jb.h to be with the rest of the
asterisk includes. These used to be wrapped in a #ifdef
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31078 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_alsa.c | 4 ++--
channels/chan_oss.c | 4 ++--
channels/chan_sip.c | 4 ++--
channels/chan_zap.c | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index a3cbfa2bc6..656607534e 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -60,6 +60,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/causes.h"
#include "asterisk/endian.h"
#include "asterisk/stringfields.h"
+#include "asterisk/abstract_jb.h"
#include "busy.h"
#include "ringtone.h"
@@ -70,8 +71,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "alsa-monitor.h"
#endif
-#include "asterisk/abstract_jb.h"
-/* Global jitterbuffer configuration - by default, jb is disabled */
+/*! Global jitterbuffer configuration - by default, jb is disabled */
static struct ast_jb_conf default_jbconf =
{
.flags = 0,
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index a25e7819c7..8e1f604133 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -75,6 +75,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/causes.h"
#include "asterisk/endian.h"
#include "asterisk/stringfields.h"
+#include "asterisk/abstract_jb.h"
/* ringtones we use */
#include "busy.h"
@@ -82,8 +83,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "ring10.h"
#include "answer.h"
-#include "asterisk/abstract_jb.h"
-/* Global jitterbuffer configuration - by default, jb is disabled */
+/*! Global jitterbuffer configuration - by default, jb is disabled */
static struct ast_jb_conf default_jbconf =
{
.flags = 0,
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 732a6b141e..ec865acbbc 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -139,6 +139,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/stringfields.h"
#include "asterisk/monitor.h"
#include "asterisk/localtime.h"
+#include "asterisk/abstract_jb.h"
#ifndef FALSE
#define FALSE 0
@@ -202,8 +203,7 @@ static int expiry = DEFAULT_EXPIRY;
#define INITIAL_CSEQ 101 /*!< our initial sip sequence number */
-#include "asterisk/abstract_jb.h"
-/* Global jitterbuffer configuration - by default, jb is disabled */
+/*! Global jitterbuffer configuration - by default, jb is disabled */
static struct ast_jb_conf default_jbconf =
{
.flags = 0,
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 016bd1a39c..5810141024 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -103,14 +103,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/utils.h"
#include "asterisk/transcap.h"
#include "asterisk/stringfields.h"
+#include "asterisk/abstract_jb.h"
#ifdef WITH_SMDI
#include "asterisk/smdi.h"
#include "asterisk/astobj.h"
#define SMDI_MD_WAIT_TIMEOUT 1500 /* 1.5 seconds */
#endif
-#include "asterisk/abstract_jb.h"
-/* Global jitterbuffer configuration - by default, jb is disabled */
+/*! Global jitterbuffer configuration - by default, jb is disabled */
static struct ast_jb_conf default_jbconf =
{
.flags = 0,
--
GitLab