kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 08:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 293046 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r293046 | rmudgett | 2010-10-26 10:53:58 -0500 (Tue, 26 Oct 2010) | 4 lines
  
  Allow the DAHDI driver to compile, even with a sufficiently older version of libpri.
  
  Fixes our Bamboo builds.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@293047 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2010-10-26 16:01:08 +00:00
parent f96d27b917
commit b6c5dde767
4 changed files with 11823 additions and 11273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
channels/sig_pri.c
View File

@@ -1427,7 +1427,7 @@ static int pri_find_empty_nobch(struct sig_pri_span *pri)
} }
#endif /* defined(HAVE_PRI_CALL_HOLD) */ #endif /* defined(HAVE_PRI_CALL_HOLD) */
#if defined(HAVE_PRI_TRANSFER) #if defined(HAVE_PRI_CALL_HOLD)
/*! /*!
* \internal * \internal
* \brief Find the channel associated with the libpri call. * \brief Find the channel associated with the libpri call.
@@ -1453,7 +1453,7 @@ static int pri_find_pri_call(struct sig_pri_span *pri, q931_call *call)
} }
return -1; return -1;
} }
#endif /* defined(HAVE_PRI_TRANSFER) */ #endif /* defined(HAVE_PRI_CALL_HOLD) */
static void *do_idle_thread(void *v_pvt) static void *do_idle_thread(void *v_pvt)
{ {
@@ -1882,7 +1882,7 @@ static void sig_pri_mcid_event(struct sig_pri_span *pri, const struct pri_subcmd
} }
#endif /* defined(HAVE_PRI_MCID) */ #endif /* defined(HAVE_PRI_MCID) */
#if defined(HAVE_PRI_TRANSFER) #if defined(HAVE_PRI_CALL_HOLD) || defined(HAVE_PRI_TRANSFER)
/*! /*!
* \internal * \internal
* \brief Copy the source connected line information to the destination for a transfer. * \brief Copy the source connected line information to the destination for a transfer.
@@ -1916,9 +1916,9 @@ static void sig_pri_connected_line_copy_transfer(struct ast_party_connected_line
ast_party_connected_line_copy(dest, &connected); ast_party_connected_line_copy(dest, &connected);
} }
#endif /* defined(HAVE_PRI_TRANSFER) */ #endif /* defined(HAVE_PRI_CALL_HOLD) || defined(HAVE_PRI_TRANSFER) */
#if defined(HAVE_PRI_TRANSFER) #if defined(HAVE_PRI_CALL_HOLD) || defined(HAVE_PRI_TRANSFER)
struct xfer_rsp_data { struct xfer_rsp_data {
struct sig_pri_span *pri; struct sig_pri_span *pri;
/*! Call to send transfer success/fail response over. */ /*! Call to send transfer success/fail response over. */
@@ -1926,7 +1926,7 @@ struct xfer_rsp_data {
/*! Invocation ID to use when sending a reply to the transfer request. */ /*! Invocation ID to use when sending a reply to the transfer request. */
int invoke_id; int invoke_id;
}; };
#endif /* defined(HAVE_PRI_TRANSFER) */ #endif /* defined(HAVE_PRI_CALL_HOLD) || defined(HAVE_PRI_TRANSFER) */
#if defined(HAVE_PRI_TRANSFER) #if defined(HAVE_PRI_TRANSFER)
/*! /*!
@@ -1947,7 +1947,7 @@ static void sig_pri_transfer_rsp(void *data, int is_successful)
} }
#endif /* defined(HAVE_PRI_TRANSFER) */ #endif /* defined(HAVE_PRI_TRANSFER) */
#if defined(HAVE_PRI_TRANSFER) #if defined(HAVE_PRI_CALL_HOLD) || defined(HAVE_PRI_TRANSFER)
/*! /*!
* \brief Protocol callback to indicate if transfer will happen. * \brief Protocol callback to indicate if transfer will happen.
* \since 1.8 * \since 1.8
@@ -1958,9 +1958,9 @@ static void sig_pri_transfer_rsp(void *data, int is_successful)
* \return Nothing * \return Nothing
*/ */
typedef void (*xfer_rsp_callback)(void *data, int is_successful); typedef void (*xfer_rsp_callback)(void *data, int is_successful);
#endif /* defined(HAVE_PRI_TRANSFER) */ #endif /* defined(HAVE_PRI_CALL_HOLD) || defined(HAVE_PRI_TRANSFER) */
#if defined(HAVE_PRI_TRANSFER) #if defined(HAVE_PRI_CALL_HOLD) || defined(HAVE_PRI_TRANSFER)
/*! /*!
* \internal * \internal
* \brief Attempt to transfer the two calls to each other. * \brief Attempt to transfer the two calls to each other.
@@ -2220,7 +2220,7 @@ static int sig_pri_attempt_transfer(struct sig_pri_span *pri, q931_call *call_1_
ast_mutex_lock(&pri->lock); ast_mutex_lock(&pri->lock);
return 0; return 0;
} }
#endif /* defined(HAVE_PRI_TRANSFER) */ #endif /* defined(HAVE_PRI_CALL_HOLD) || defined(HAVE_PRI_TRANSFER) */
#if defined(HAVE_PRI_CCSS) #if defined(HAVE_PRI_CCSS)
/*! /*!
@@ -5595,7 +5595,7 @@ static void *pri_dchannel(void *vpri)
sig_pri_lock_private(pri->pvts[chanpos]); sig_pri_lock_private(pri->pvts[chanpos]);
sig_pri_handle_subcmds(pri, chanpos, e->e, e->hangup.channel, sig_pri_handle_subcmds(pri, chanpos, e->e, e->hangup.channel,
e->hangup.subcmds, e->hangup.call); e->hangup.subcmds, e->hangup.call);
#if defined(HAVE_PRI_TRANSFER) #if defined(HAVE_PRI_CALL_HOLD)
if (e->hangup.call_active && e->hangup.call_held if (e->hangup.call_active && e->hangup.call_held
&& pri->hold_disconnect_transfer) { && pri->hold_disconnect_transfer) {
/* We are to transfer the call instead of simply hanging up. */ /* We are to transfer the call instead of simply hanging up. */
@@ -5606,7 +5606,7 @@ static void *pri_dchannel(void *vpri)
} }
sig_pri_lock_private(pri->pvts[chanpos]); sig_pri_lock_private(pri->pvts[chanpos]);
} }
#endif /* defined(HAVE_PRI_TRANSFER) */ #endif /* defined(HAVE_PRI_CALL_HOLD) */
switch (e->hangup.cause) { switch (e->hangup.cause) {
case PRI_CAUSE_USER_BUSY: case PRI_CAUSE_USER_BUSY:
case PRI_CAUSE_NORMAL_CIRCUIT_CONGESTION: case PRI_CAUSE_NORMAL_CIRCUIT_CONGESTION:

22794
configure vendored
View File

File diff suppressed because it is too large Load Diff

2
configure.ac
View File

@@ -1784,7 +1784,7 @@ AST_EXT_LIB_CHECK([PRI_MWI], [pri], [pri_mwi_indicate], [libpri.h])
AST_EXT_LIB_CHECK([PRI_MCID], [pri], [pri_mcid_enable], [libpri.h]) AST_EXT_LIB_CHECK([PRI_MCID], [pri], [pri_mcid_enable], [libpri.h])
AST_EXT_LIB_CHECK([PRI_CALL_WAITING], [pri], [pri_connect_ack_enable], [libpri.h]) AST_EXT_LIB_CHECK([PRI_CALL_WAITING], [pri], [pri_connect_ack_enable], [libpri.h])
AST_EXT_LIB_CHECK([PRI_AOC_EVENTS], [pri], [pri_aoc_events_enable], [libpri.h]) AST_EXT_LIB_CHECK([PRI_AOC_EVENTS], [pri], [pri_aoc_events_enable], [libpri.h])
AST_EXT_LIB_CHECK([PRI_TRANSFER], [pri], [pri_transfer_rsp], [libpri.h]) AST_EXT_LIB_CHECK([PRI_TRANSFER], [pri], [pri_transfer_enable], [libpri.h])
AST_EXT_LIB_CHECK([PRI_CCSS], [pri], [pri_cc_enable], [libpri.h]) AST_EXT_LIB_CHECK([PRI_CCSS], [pri], [pri_cc_enable], [libpri.h])
AST_EXT_LIB_CHECK([PRI_HANGUP_FIX], [pri], [pri_hangup_fix_enable], [libpri.h]) AST_EXT_LIB_CHECK([PRI_HANGUP_FIX], [pri], [pri_hangup_fix_enable], [libpri.h])
AST_EXT_LIB_CHECK([PRI_SUBADDR], [pri], [pri_sr_set_called_subaddress], [libpri.h]) AST_EXT_LIB_CHECK([PRI_SUBADDR], [pri], [pri_sr_set_called_subaddress], [libpri.h])

48
include/asterisk/autoconfig.h.in
View File

@@ -1091,9 +1091,6 @@
/* Define to the version of this package. */ /* Define to the version of this package. */
#undef PACKAGE_VERSION #undef PACKAGE_VERSION
/* Define to 1 if the C compiler supports function prototypes. */
#undef PROTOTYPES
/* Define to necessary symbol if this constant uses a non-standard name on /* Define to necessary symbol if this constant uses a non-standard name on
your system. */ your system. */
#undef PTHREAD_CREATE_JOINABLE #undef PTHREAD_CREATE_JOINABLE
@@ -1113,11 +1110,6 @@
/* Define to the type of arg 5 for `select'. */ /* Define to the type of arg 5 for `select'. */
#undef SELECT_TYPE_ARG5 #undef SELECT_TYPE_ARG5
/* Define to 1 if the `setvbuf' function takes the buffering type as its
second argument and the buffer pointer as the third, as on System V before
release 3. */
#undef SETVBUF_REVERSED
/* The size of `char *', as computed by sizeof. */ /* The size of `char *', as computed by sizeof. */
#undef SIZEOF_CHAR_P #undef SIZEOF_CHAR_P
@@ -1153,12 +1145,27 @@
/* Define to a type of the same size as fd_set.fds_bits[[0]] */ /* Define to a type of the same size as fd_set.fds_bits[[0]] */
#undef TYPEOF_FD_SET_FDS_BITS #undef TYPEOF_FD_SET_FDS_BITS
/* Define to 1 if on AIX 3. /* Enable extensions on AIX 3, Interix. */
System headers sometimes define this.
We just want to avoid a redefinition error message. */
#ifndef _ALL_SOURCE #ifndef _ALL_SOURCE
# undef _ALL_SOURCE # undef _ALL_SOURCE
#endif #endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Enable threading extensions on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
/* Define to 1 if running on Darwin. */ /* Define to 1 if running on Darwin. */
#undef _DARWIN_UNLIMITED_SELECT #undef _DARWIN_UNLIMITED_SELECT
@@ -1166,11 +1173,6 @@
/* Number of bits in a file offset, on hosts where this is settable. */ /* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS #undef _FILE_OFFSET_BITS
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
#undef _LARGEFILE_SOURCE #undef _LARGEFILE_SOURCE
@@ -1187,20 +1189,6 @@
/* Define to 1 if you need to in order for `stat' and other things to work. */ /* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE #undef _POSIX_SOURCE
/* Enable extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Define like PROTOTYPES; this can be used by system headers. */
#undef __PROTOTYPES
/* Define to empty if `const' does not conform to ANSI C. */ /* Define to empty if `const' does not conform to ANSI C. */
#undef const #undef const