[SCM] GNU gnutls branch, master, updated. gnutls_2_99_1-19-g5bf19aa

[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=5bf19aab9133c615b599d661221d6650939c718b

The branch, master has been updated
       via  5bf19aab9133c615b599d661221d6650939c718b (commit)
      from  fdbf94bdd69ade7db79f7c6142055d0fafe163ec (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 5bf19aab9133c615b599d661221d6650939c718b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat May 7 23:34:07 2011 +0200

    undef X509_NAME before including openssl.h.

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

Summary of changes:
 libextra/gnutls_openssl.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/libextra/gnutls_openssl.c b/libextra/gnutls_openssl.c
index 5eadc94..3754d96 100644
--- a/libextra/gnutls_openssl.c
+++ b/libextra/gnutls_openssl.c
@@ -26,11 +26,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <gnutls/openssl.h>
 #include "../lib/gnutls_int.h"
 #include "../lib/random.h"
 #include "../lib/gnutls_hash_int.h"
 
+/* In win32 X509_NAME is defined in wincrypt.h.
+ * undefine it to avoid the conflict with openssl.h.
+ */
+#ifdef X509_NAME
+# undef X509_NAME
+#endif
+#include <gnutls/openssl.h>
+
 /* Gnulib re-defines shutdown on mingw.  We only use it as a variable
    name, so restore the original name. */
 #undef shutdown


hooks/post-receive
-- 
GNU gnutls