[SCM] GNU gnutls branch, gnutls_3_1_x, updated. gnutls_3_1_1-1-g231ff8b

[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=231ff8b297fdbb475da8da2a5472da2b0030df39

The branch, gnutls_3_1_x has been updated
       via  231ff8b297fdbb475da8da2a5472da2b0030df39 (commit)
      from  4ae6b978306bd15a5d6dec65fba26a9d2faf7d9a (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 231ff8b297fdbb475da8da2a5472da2b0030df39
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Sep 2 21:19:13 2012 +0200

    mingw64 compilation fixes

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

Summary of changes:
 src/libopts/makeshell.c |    8 ++++++++
 src/serv.c              |    2 +-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/libopts/makeshell.c b/src/libopts/makeshell.c
index 79edb70..d2ce661 100644
--- a/src/libopts/makeshell.c
+++ b/src/libopts/makeshell.c
@@ -28,6 +28,14 @@
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
+#include <config.h>
+
+/* Work around problem reported in
+   <http://permalink.gmane.org/gmane.comp.lib.gnulib.bugs/15755>.*/
+#if GETTIMEOFDAY_CLOBBERS_LOCALTIME
+#undef localtime
+#endif
+
 tOptions * optionParseShellOptions = NULL;
 
 static char const * shell_prog = NULL;
diff --git a/src/serv.c b/src/serv.c
index 42317e6..2003500 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -730,7 +730,7 @@ listen_socket (const char *name, int listen_port, int 
socktype)
           continue;
         }
 
-#ifdef HAVE_IPV6
+#if defined(HAVE_IPV6) && !defined(_WIN32)
       if (ptr->ai_family == AF_INET6)
         {
           yes = 1;


hooks/post-receive
-- 
GNU gnutls