[svn-commits] kpfleming: trunk r65979 - in /trunk: ./ channels/chan_gtalk.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Thu May 24 14:05:42 2007
New Revision: 65979

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65979
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_gtalk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_gtalk.c?view=diff&rev=65979&r1=65978&r2=65979
==============================================================================
--- trunk/channels/chan_gtalk.c (original)
+++ trunk/channels/chan_gtalk.c Thu May 24 14:05:42 2007
@@ -47,10 +47,12 @@
 #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 @@
 /*! \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(&gtalk_list);
 	if (!gtalk_load_config()) {