[SCM] GNU gnutls branch, master, updated. gnutls_3_0_4-19-g6ae032b

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=6ae032b15ef7eb0608158245f477e0c9f2218abe

The branch, master has been updated
       via  6ae032b15ef7eb0608158245f477e0c9f2218abe (commit)
       via  be68a4889aadbe4e7732f49e96e10275bd5b4034 (commit)
      from  95820fc37206240edee922d89d111d61dab5a052 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6ae032b15ef7eb0608158245f477e0c9f2218abe
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Oct 23 13:21:50 2011 +0200

    removed extra.h header from guile code.

commit be68a4889aadbe4e7732f49e96e10275bd5b4034
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Oct 23 13:21:01 2011 +0200

    removed libextra errors.

-----------------------------------------------------------------------

Summary of changes:
 guile/modules/gnutls.scm        |    2 --
 guile/src/make-enum-header.scm  |    1 -
 lib/includes/gnutls/gnutls.h.in |    7 -------
 3 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/guile/modules/gnutls.scm b/guile/modules/gnutls.scm
index 0f4aa62..cecc3fd 100644
--- a/guile/modules/gnutls.scm
+++ b/guile/modules/gnutls.scm
@@ -312,8 +312,6 @@
            error/file-error
            error/too-many-empty-packets
            error/unknown-pk-algorithm
-           error/init-libextra
-           error/library-version-mismatch
            error/no-temporary-rsa-params
            error/lzo-init-failed
            error/no-compression-algorithms
diff --git a/guile/src/make-enum-header.scm b/guile/src/make-enum-header.scm
index e9085c6..4329be4 100644
--- a/guile/src/make-enum-header.scm
+++ b/guile/src/make-enum-header.scm
@@ -48,7 +48,6 @@
 
     (if extra?
         (begin
-          (format port "#include <gnutls/extra.h>~%")
           (format port "#include <gnutls/openpgp.h>~%")))
 
     (for-each (lambda (enum)
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 77ee1f4..fefb698 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -1681,13 +1681,6 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t 
session);
 #define GNUTLS_E_UNKNOWN_PK_ALGORITHM -80
 #define GNUTLS_E_TOO_MANY_HANDSHAKE_PACKETS -81
 
-  /* returned if libextra functionality was requested but
-   * gnutls_global_init_extra() was not called.
-   */
-#define GNUTLS_E_INIT_LIBEXTRA -82
-#define GNUTLS_E_LIBRARY_VERSION_MISMATCH -83
-
-
   /* returned if you need to generate temporary RSA
    * parameters. These are needed for export cipher suites.
    */


hooks/post-receive
-- 
GNU gnutls