diff options
| -rw-r--r-- | lib/gnutls_global.c | 2 | ||||
| -rw-r--r-- | lib/includes/gnutls/compat.h | 1 | ||||
| -rw-r--r-- | libextra/gnutls_extra.c | 2 | ||||
| -rw-r--r-- | libextra/includes/gnutls/extra.h | 2 | ||||
| -rw-r--r-- | libextra/includes/gnutls/openssl.h | 4 | ||||
| -rw-r--r-- | tests/openssl.c | 4 | ||||
| -rw-r--r-- | tests/simple.c | 8 |
7 files changed, 12 insertions, 11 deletions
diff --git a/lib/gnutls_global.c b/lib/gnutls_global.c index 6b149cfbb0..f04e7e590e 100644 --- a/lib/gnutls_global.c +++ b/lib/gnutls_global.c @@ -322,7 +322,7 @@ gnutls_transport_set_push_function (gnutls_session_t session, * * Check GnuTLS Library version. * - * See %LIBGNUTLS_VERSION for a suitable @req_version string. + * See %GNUTLS_VERSION for a suitable @req_version string. * * Return value: Check that the version of the library is at * minimum the one given as a string in @req_version and return the diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h index b269f7fa75..0232103c7c 100644 --- a/lib/includes/gnutls/compat.h +++ b/lib/includes/gnutls/compat.h @@ -96,5 +96,6 @@ #define LIBGNUTLS_VERSION_MINOR GNUTLS_VERSION_MINOR #define LIBGNUTLS_VERSION_PATCH GNUTLS_VERSION_PATCH #define LIBGNUTLS_VERSION_NUMBER GNUTLS_VERSION_NUMBER +#define LIBGNUTLS_EXTRA_VERSION GNUTLS_VERSION #endif /* GNUTLS_COMPAT_H */ diff --git a/libextra/gnutls_extra.c b/libextra/gnutls_extra.c index 95ee25a3f8..fc79207883 100644 --- a/libextra/gnutls_extra.c +++ b/libextra/gnutls_extra.c @@ -154,7 +154,7 @@ gnutls_global_init_extra (void) * * Check GnuTLS Extra Library version. * - * See %LIBGNUTLS_EXTRA_VERSION for a suitable @req_version string. + * See %GNUTLS_EXTRA_VERSION for a suitable @req_version string. * * Return value: Check that the version of the library is at * minimum the one given as a string in @req_version and return the diff --git a/libextra/includes/gnutls/extra.h b/libextra/includes/gnutls/extra.h index 0a2c35e1c0..36e950cb8c 100644 --- a/libextra/includes/gnutls/extra.h +++ b/libextra/includes/gnutls/extra.h @@ -36,7 +36,7 @@ extern "C" { #endif -#define LIBGNUTLS_EXTRA_VERSION LIBGNUTLS_VERSION +#define GNUTLS_EXTRA_VERSION GNUTLS_VERSION /* TLS/IA stuff */ diff --git a/libextra/includes/gnutls/openssl.h b/libextra/includes/gnutls/openssl.h index 106d5a53c7..22e269fd63 100644 --- a/libextra/includes/gnutls/openssl.h +++ b/libextra/includes/gnutls/openssl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation + * Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation * Copyright (c) 2002 Andrew McDonald <andrew@mcdonald.org.uk> * * This file is part of GNUTLS-EXTRA. @@ -65,7 +65,7 @@ extern "C" #define OPENSSL_VERSION_NUMBER (0x0090604F) #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER -#define OPENSSL_VERSION_TEXT ("GNUTLS " LIBGNUTLS_VERSION " ") +#define OPENSSL_VERSION_TEXT ("GNUTLS " GNUTLS_VERSION " ") #define SSL_ERROR_NONE (0) #define SSL_ERROR_SSL (1) diff --git a/tests/openssl.c b/tests/openssl.c index f2b1e6a444..5360acd1d9 100644 --- a/tests/openssl.c +++ b/tests/openssl.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2008 Free Software Foundation + * Copyright (C) 2004, 2005, 2008, 2009 Free Software Foundation * * Author: Simon Josefsson * @@ -39,7 +39,7 @@ doit (void) if (gnutls_global_init () != 0) fail ("gnutls_global_init\n"); - if (!gnutls_check_version (LIBGNUTLS_VERSION)) + if (!gnutls_check_version (GNUTLS_VERSION)) success ("gnutls_check_version ERROR\n"); MD5_Init (&c); diff --git a/tests/simple.c b/tests/simple.c index c9c498ff2b..5f1645494e 100644 --- a/tests/simple.c +++ b/tests/simple.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2008 Free Software Foundation + * Copyright (C) 2004, 2005, 2008, 2009 Free Software Foundation * * Author: Simon Josefsson * @@ -31,10 +31,10 @@ void doit (void) { - printf ("GNUTLS header version %s.\n", LIBGNUTLS_VERSION); - printf ("GNUTLS library version %s.\n", gnutls_check_version (NULL)); + printf ("GnuTLS header version %s.\n", GNUTLS_VERSION); + printf ("GnuTLS library version %s.\n", gnutls_check_version (NULL)); - if (gnutls_check_version (LIBGNUTLS_VERSION)) + if (gnutls_check_version (GNUTLS_VERSION)) success ("gnutls_check_version OK\n"); else fail ("gnutls_check_version ERROR\n"); |