[asterisk-commits] trunk r31078 - in /trunk/channels: chan_alsa.c chan_oss.c chan_sip.c chan_zap.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed May 31 12:29:12 2006
New Revision: 31078

URL: http://svn.digium.com/view/asterisk?rev=31078&view=rev
Log:
move the includes of abstract_jb.h to be with the rest of the asterisk includes.
These used to be wrapped in a #ifdef

Modified:
    trunk/channels/chan_alsa.c
    trunk/channels/chan_oss.c
    trunk/channels/chan_sip.c
    trunk/channels/chan_zap.c

Modified: trunk/channels/chan_alsa.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_alsa.c?rev=31078&r1=31077&r2=31078&view=diff
==============================================================================
--- trunk/channels/chan_alsa.c (original)
+++ trunk/channels/chan_alsa.c Wed May 31 12:29:12 2006
@@ -60,6 +60,7 @@
 #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 @@
 #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,

Modified: trunk/channels/chan_oss.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_oss.c?rev=31078&r1=31077&r2=31078&view=diff
==============================================================================
--- trunk/channels/chan_oss.c (original)
+++ trunk/channels/chan_oss.c Wed May 31 12:29:12 2006
@@ -75,6 +75,7 @@
 #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 @@
 #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,

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=31078&r1=31077&r2=31078&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed May 31 12:29:12 2006
@@ -139,6 +139,7 @@
 #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 @@
 
 #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,

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?rev=31078&r1=31077&r2=31078&view=diff
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Wed May 31 12:29:12 2006
@@ -103,14 +103,14 @@
 #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,