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

diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index a3cbfa2bc6ad3acd029588670a8c805d21054963..656607534e863fc1d56ada2b378cee178d95a02b 100644 (file)
--- 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 a25e7819c7c526c6d502ef7d7518f5e6fa5f0f0e..8e1f60413396df5b41f58fa1360f587d7845763f 100644 (file)
--- 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 732a6b141eed5379f46f3b47c4a78db4fd046eb7..ec865acbbca66ab18824c571f556a2786e0b798a 100644 (file)
--- 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 016bd1a39cf340559d24a6cc28224e79bafb6d34..5810141024be74bd78d351887604423b02b219c8 100644 (file)
--- 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,