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: http://svn.digium.com/svn/asterisk/trunk@31078 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
1266abd232
commit
1bc556314d
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
Reference in New Issue