Merged revisions 65965-65967 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65965 | kpfleming | 2007-05-24 14:24:55 -0400 (Thu, 24 May 2007) | 2 lines don't use uninitialized variables ........ r65966 | kpfleming | 2007-05-24 14:25:21 -0400 (Thu, 24 May 2007) | 2 lines don't reference GnuTLS headers and functions unless the configure script found it ........ r65967 | kpfleming | 2007-05-24 14:28:48 -0400 (Thu, 24 May 2007) | 2 lines oops, use #ifdef instead of #if ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65979 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
4b3a3fb14c
commit
287bcc6127
|
@ -47,10 +47,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|||
#include <arpa/inet.h>
|
||||
#include <sys/signal.h>
|
||||
#include <iksemel.h>
|
||||
|
||||
#include <gcrypt.h>
|
||||
#include <pthread.h>
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
#include <gcrypt.h>
|
||||
GCRY_THREAD_OPTION_PTHREAD_IMPL;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
#include "asterisk/lock.h"
|
||||
#include "asterisk/channel.h"
|
||||
|
@ -1820,7 +1822,9 @@ static int gtalk_load_config(void)
|
|||
/*! \brief Load module into PBX, register channel */
|
||||
static int load_module(void)
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
ASTOBJ_CONTAINER_INIT(>alk_list);
|
||||
if (!gtalk_load_config()) {
|
||||
|
|
Loading…
Reference in New Issue