diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-01 23:26:51 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-01 23:26:51 +0000 |
| commit | 8af80a59de696b8be87cd2c131004416a136ad6c (patch) | |
| tree | d15470b540dd2fb7c1635f937d6d03ac3a0cbb51 /channels | |
| parent | 82ba695b0020c2b2240d7025e3214d5fa5ba0a0c (diff) | |
Remove traces of gnutls, since we no longer use/need it.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@88184 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_gtalk.c | 11 | ||||
| -rw-r--r-- | channels/chan_jingle.c | 11 |
2 files changed, 2 insertions, 20 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 0bef78eae..f67cd6c0b 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -28,7 +28,7 @@ /*** MODULEINFO <depend>iksemel</depend> <depend>res_jabber</depend> - <use>gnutls</use> + <use>openssl</use> ***/ #include "asterisk.h" @@ -50,11 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <iksemel.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" #include "asterisk/config.h" @@ -1901,10 +1896,6 @@ 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()) { ast_log(LOG_ERROR, "Unable to read config file %s. Not loading module.\n", GOOGLE_CONFIG); diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 37c7e69a2..1340ff836 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -30,7 +30,7 @@ /*** MODULEINFO <depend>iksemel</depend> <depend>res_jabber</depend> - <use>gnutls</use> + <use>openssl</use> ***/ #include "asterisk.h" @@ -51,11 +51,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <iksemel.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" #include "asterisk/config.h" @@ -1804,10 +1799,6 @@ static int jingle_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(&jingle_list); if (!jingle_load_config()) { ast_log(LOG_ERROR, "Unable to read config file %s. Not loading module.\n", JINGLE_CONFIG); |