[SCM] GNU gnutls branch, master, updated. gnutls_2_99_0-54-g6c5fc71

[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=6c5fc71830d12aa8ef71ebaa6af062b6370ef671

The branch, master has been updated
       via  6c5fc71830d12aa8ef71ebaa6af062b6370ef671 (commit)
       via  381a8aad6db78def7aa94c82d3328b191ed4e289 (commit)
      from  e08fe335731fe037ebb374950d06f044bc844c8f (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 6c5fc71830d12aa8ef71ebaa6af062b6370ef671
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Apr 16 14:08:47 2011 +0200

    removed conditional compilation.

commit 381a8aad6db78def7aa94c82d3328b191ed4e289
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Apr 16 14:07:05 2011 +0200

    use correct header.

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

Summary of changes:
 lib/accelerated/cryptodev.c |    2 +-
 lib/ext/session_ticket.h    |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/lib/accelerated/cryptodev.c b/lib/accelerated/cryptodev.c
index 4e09c4d..dd4bbb1 100644
--- a/lib/accelerated/cryptodev.c
+++ b/lib/accelerated/cryptodev.c
@@ -25,7 +25,7 @@
 #include <gnutls_errors.h>
 #include <gnutls_int.h>
 #include <gnutls/crypto.h>
-#include <gnutls_cryptodev.h>
+#include <accelerated/cryptodev.h>
 #include <gnutls_errors.h>
 
 #ifdef ENABLE_CRYPTODEV
diff --git a/lib/ext/session_ticket.h b/lib/ext/session_ticket.h
index 608b7d5..0c40935 100644
--- a/lib/ext/session_ticket.h
+++ b/lib/ext/session_ticket.h
@@ -25,8 +25,6 @@
 #ifndef EXT_SESSION_TICKET_H
 #define EXT_SESSION_TICKET_H
 
-#ifdef ENABLE_SESSION_TICKET
-
 #include <gnutls_extensions.h>
 
 extern extension_entry_st ext_mod_session_ticket;
@@ -35,4 +33,3 @@ int _gnutls_send_new_session_ticket (gnutls_session_t 
session, int again);
 int _gnutls_recv_new_session_ticket (gnutls_session_t session);
 
 #endif
-#endif


hooks/post-receive
-- 
GNU gnutls