diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-24 19:05:42 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-24 19:05:42 +0000 |
| commit | 900d290f1f9e29c17f8a2911b4014cb17547a1f2 (patch) | |
| tree | 63389997e00e9bb678d5e5524b674afa58cf4b99 /channels/chan_gtalk.c | |
| parent | a42bc96f14e6c4c6c8fe8e7c743df555036e885b (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@65979 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_gtalk.c')
| -rw-r--r-- | channels/chan_gtalk.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index c224c1e03..03b99f68e 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -47,10 +47,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <arpa/inet.h> #include <sys/signal.h> #include <iksemel.h> +#include <pthread.h> +#ifdef HAVE_GNUTLS #include <gcrypt.h> -#include <pthread.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()) { |