Changeset 797:36821971d47b in freeDiameter for libfdcore/core.c

Timestamp:

Aug 21, 2012, 5:16:21 AM (12 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Renamed GNUTLS_NEW_VERSION and added GNUTLS_VERSION_300 to prepare for API change in gnutls

File:

• libfdcore/core.c (modified) (2 diffs)

libfdcore/core.c

@@ -184 +184 @@
         
         /* 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) ) {
@@ -193 +193 @@
                 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 */
         }