Mercurial > hg > freeDiameter
diff libfdcore/core.c @ 797:36821971d47b
Renamed GNUTLS_NEW_VERSION and added GNUTLS_VERSION_300 to prepare for API change in gnutls
| author | Sebastien Decugis <sdecugis@nict.go.jp> |
|---|---|
| date | Mon, 20 Aug 2012 22:16:21 +0200 |
| parents | 96c75744d3c4 |
| children | 7895724d2787 |
line wrap: on
line diff
--- a/libfdcore/core.c Mon Aug 20 22:15:38 2012 +0200 +++ b/libfdcore/core.c Mon Aug 20 22:16:21 2012 +0200 @@ -183,20 +183,20 @@ fd_log_threadname("Main"); /* Initialize gcrypt and gnutls */ - #ifndef GNUTLS_NEW_VERSION + #ifndef GNUTLS_VERSION_210 GNUTLS_TRACE( (void) gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread) ); GNUTLS_TRACE( (void) gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0) ); - #endif /* GNUTLS_NEW_VERSION */ + #endif /* GNUTLS_VERSION_210 */ CHECK_GNUTLS_DO( gnutls_global_init(), return EINVAL ); if ( ! gnutls_check_version(GNUTLS_VERSION) ) { fprintf(stderr, "The GNUTLS library is too old; found '%s', need '" GNUTLS_VERSION "'\n", gnutls_check_version(NULL)); return EINVAL; } else { - #ifdef GNUTLS_NEW_VERSION + #ifdef GNUTLS_VERSION_210 TRACE_DEBUG(INFO, "libgnutls '%s' initialized.", gnutls_check_version(NULL) ); - #else /* GNUTLS_NEW_VERSION */ + #else /* GNUTLS_VERSION_210 */ TRACE_DEBUG(INFO, "libgnutls '%s', libgcrypt '%s', initialized.", gnutls_check_version(NULL), gcry_check_version(NULL) ); - #endif /* GNUTLS_NEW_VERSION */ + #endif /* GNUTLS_VERSION_210 */ } /* Initialize the config with default values */