From 4e7158060256751788b07b19c7a87e652eb39f13 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Wed, 28 Oct 2009 06:09:15 +0000 Subject: Ticket #957: Updated PJSIP_HAS_TLS_TRANSPORT default value to refer to PJ_HAS_SSL_SOCK. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2973 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip/include/pjsip/sip_autoconf.h.in | 10 +++++----- pjsip/include/pjsip/sip_config.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'pjsip') diff --git a/pjsip/include/pjsip/sip_autoconf.h.in b/pjsip/include/pjsip/sip_autoconf.h.in index 5372b2c3..38eda08d 100644 --- a/pjsip/include/pjsip/sip_autoconf.h.in +++ b/pjsip/include/pjsip/sip_autoconf.h.in @@ -26,14 +26,14 @@ * autoconf) */ -/** +/* * Enable/disable TLS transport, as configured by autoconf. * But only do this if user doesn't explicitly configure in pj/config_site.h. */ -#ifndef PJSIP_HAS_TLS_TRANSPORT -#undef PJSIP_HAS_TLS_TRANSPORT -#endif - +/* Since 1.5, the default setting will follow PJ_HAS_SSL_SOCK setting. */ +//#ifndef PJSIP_HAS_TLS_TRANSPORT +//#undef PJSIP_HAS_TLS_TRANSPORT +//#endif #endif /* __PJSIP_SIP_AUTOCONF_H__ */ diff --git a/pjsip/include/pjsip/sip_config.h b/pjsip/include/pjsip/sip_config.h index 5bbe420f..8dc4a82e 100644 --- a/pjsip/include/pjsip/sip_config.h +++ b/pjsip/include/pjsip/sip_config.h @@ -513,10 +513,10 @@ PJ_INLINE(pjsip_cfg_t*) pjsip_cfg(void) * Enable TLS SIP transport support. For most systems this means that * OpenSSL must be installed. * - * Default: 0 (for now) + * Default: follow PJ_HAS_SSL_SOCK setting, which is 0 (disabled) by default. */ #ifndef PJSIP_HAS_TLS_TRANSPORT -# define PJSIP_HAS_TLS_TRANSPORT 0 +# define PJSIP_HAS_TLS_TRANSPORT PJ_HAS_SSL_SOCK #endif -- cgit v1.2.3