[SCM] GNU gsasl branch, master, updated. gsasl-1-3-13-gb04aa9c

[Simon Josefsson]

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 gsasl".

http://git.savannah.gnu.org/cgit/gsasl.git/commit/?id=b04aa9c4545b5f21fac136a83ddd7c1183f65b70

The branch, master has been updated
       via  b04aa9c4545b5f21fac136a83ddd7c1183f65b70 (commit)
       via  56920b47d841c0a918b34934391346baa8e564e1 (commit)
      from  f74ca982889811ccecf498a27f090192e152c877 (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 b04aa9c4545b5f21fac136a83ddd7c1183f65b70
Author: Simon Josefsson <address@hidden>
Date:   Mon Oct 12 15:45:37 2009 +0200

    Drop Windows compatibility stuff, should be taken care of gnulib now.

commit 56920b47d841c0a918b34934391346baa8e564e1
Author: Simon Josefsson <address@hidden>
Date:   Mon Oct 12 15:38:21 2009 +0200

    Update gnulib files.

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

Summary of changes:
 gl/Makefile.am        |    2 +-
 gl/m4/gnulib-cache.m4 |    4 ++--
 gl/unistd.in.h        |    2 +-
 lib/gl/unistd.in.h    |    2 +-
 src/gsasl.c           |   17 -----------------
 5 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/gl/Makefile.am b/gl/Makefile.am
index 5e9ad53..28db2ba 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -9,7 +9,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override 
--lib=libgl --source-base=gl --m4-base=gl/m4 --doc-base=doc 
--tests-base=gltests --aux-dir=lib/build-aux --with-tests --libtool 
--macro-prefix=gl --no-vc-files autobuild close connect error exit fdl-1.3 
gendocs getaddrinfo getopt getpass gpl-3.0 lgpl-2.1 maintainer-makefile 
manywarnings netdb netinet_in pmccabe2html poll progname quote readline recv 
shutdown socket striconv sys_time unistd version-etc warnings xalloc
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override 
--lib=libgl --source-base=gl --m4-base=gl/m4 --doc-base=doc 
--tests-base=gltests --aux-dir=lib/build-aux --with-tests --libtool 
--macro-prefix=gl --no-vc-files autobuild close connect error exit fdl-1.3 
gendocs getaddrinfo getopt-gnu getpass gpl-3.0 lgpl-2.1 maintainer-makefile 
manywarnings netdb netinet_in pmccabe2html poll progname quote readline recv 
shutdown socket striconv sys_time unistd version-etc warnings xalloc
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index 57fdd99..680b698 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgl 
--source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gltests 
--aux-dir=lib/build-aux --with-tests --libtool --macro-prefix=gl --no-vc-files 
autobuild close connect error exit fdl-1.3 gendocs getaddrinfo getopt getpass 
gpl-3.0 lgpl-2.1 maintainer-makefile manywarnings netdb netinet_in pmccabe2html 
poll progname quote readline recv shutdown socket striconv sys_time unistd 
version-etc warnings xalloc
+#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgl 
--source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gltests 
--aux-dir=lib/build-aux --with-tests --libtool --macro-prefix=gl --no-vc-files 
autobuild close connect error exit fdl-1.3 gendocs getaddrinfo getopt-gnu 
getpass gpl-3.0 lgpl-2.1 maintainer-makefile manywarnings netdb netinet_in 
pmccabe2html poll progname quote readline recv shutdown socket striconv 
sys_time unistd version-etc warnings xalloc
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([gl/override])
@@ -28,7 +28,7 @@ gl_MODULES([
   fdl-1.3
   gendocs
   getaddrinfo
-  getopt
+  getopt-gnu
   getpass
   gpl-3.0
   lgpl-2.1
diff --git a/gl/unistd.in.h b/gl/unistd.in.h
index 0e31883..c755467 100644
--- a/gl/unistd.in.h
+++ b/gl/unistd.in.h
@@ -239,7 +239,7 @@ extern char **environ;
 
 #if @GNULIB_EUIDACCESS@
 # if address@hidden@
-/* Like access(), except that is uses the effective user id and group id of
+/* Like access(), except that it uses the effective user id and group id of
    the current process.  */
 extern int euidaccess (const char *filename, int mode);
 # endif
diff --git a/lib/gl/unistd.in.h b/lib/gl/unistd.in.h
index 1319d10..c7a0dc9 100644
--- a/lib/gl/unistd.in.h
+++ b/lib/gl/unistd.in.h
@@ -239,7 +239,7 @@ extern char **environ;
 
 #if @GNULIB_EUIDACCESS@
 # if address@hidden@
-/* Like access(), except that is uses the effective user id and group id of
+/* Like access(), except that it uses the effective user id and group id of
    the current process.  */
 extern int euidaccess (const char *filename, int mode);
 # endif
diff --git a/src/gsasl.c b/src/gsasl.c
index dd672ff..b65bd79 100644
--- a/src/gsasl.c
+++ b/src/gsasl.c
@@ -23,10 +23,6 @@
 #include "imap.h"
 #include "smtp.h"
 
-#ifdef HAVE_WS2TCPIP_H
-# include <ws2tcpip.h>
-#endif
-
 #ifdef HAVE_LIBGNUTLS
 # include <gnutls/gnutls.h>
 gnutls_session session;
@@ -300,19 +296,6 @@ main (int argc, char *argv[])
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-#ifdef HAVE_WS2TCPIP_H
-  {
-    WORD wVersionRequested;
-    WSADATA wsaData;
-    int r;
-
-    wVersionRequested = MAKEWORD (2, 0);
-    r = WSAStartup (wVersionRequested, &wsaData);
-    if (r)
-      error (EXIT_FAILURE, 0, _("cannot initialize Windows sockets"));
-  }
-#endif
-
   if (cmdline_parser (argc, argv, &args_info) != 0)
     return EXIT_FAILURE;
 


hooks/post-receive
-- 
GNU gsasl