[SCM] GNU gsasl branch, master, updated. gsasl-1-4-0-29-g49c52c6

[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=49c52c62c06b27b4c97fa2c295436bb6b3cd5baf

The branch, master has been updated
       via  49c52c62c06b27b4c97fa2c295436bb6b3cd5baf (commit)
       via  990088df747537602ea607ee52c499779a16b195 (commit)
      from  f1d084f313efcb46bae0fc5a421382aff714d67e (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 49c52c62c06b27b4c97fa2c295436bb6b3cd5baf
Author: Simon Josefsson <address@hidden>
Date:   Fri Feb 5 09:20:06 2010 +0100

    Update gnulib files.

commit 990088df747537602ea607ee52c499779a16b195
Author: Simon Josefsson <address@hidden>
Date:   Fri Feb 5 09:17:04 2010 +0100

    Add.

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

Summary of changes:
 .gitignore                  |   20 +++++++++++++++
 gl/m4/gettimeofday.m4       |   58 +++++++++++++++++++++++++++---------------
 gltests/test-gettimeofday.c |    8 ++---
 3 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 65402a1..2e685fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,11 +19,27 @@ configure
 doc/abstraction.pdf
 doc/controlflow.pdf
 doc/controlflow2.pdf
+doc/cyclo/cyclo-gsasl.html
 doc/doxygen/Doxyfile
 doc/gsasl-api-error-labels.texi
 doc/gsasl.1
+doc/gsasl.aux
+doc/gsasl.cp
+doc/gsasl.cps
+doc/gsasl.dvi
+doc/gsasl.fn
+doc/gsasl.fns
+doc/gsasl.html
 doc/gsasl.info
 doc/gsasl.info-1
+doc/gsasl.ky
+doc/gsasl.log
+doc/gsasl.pdf
+doc/gsasl.pg
+doc/gsasl.ps
+doc/gsasl.toc
+doc/gsasl.tp
+doc/gsasl.vr
 doc/man/
 doc/print-errors
 doc/reference/
@@ -105,6 +121,7 @@ gltests/test-wchar
 gltests/test-wctype
 gltests/time.h
 gltests/warn-on-use.h
+gsasl-*.tar.gz
 lib/aclocal.m4
 lib/autom4te.cache/
 lib/build-aux/config.guess
@@ -134,7 +151,10 @@ lib/gltests/libtests.a
 lib/gltests/test-alloca-opt
 lib/gltests/test-base64
 lib/gltests/test-errno
+lib/gltests/test-gc
+lib/gltests/test-gc-hmac-md5
 lib/gltests/test-gc-hmac-sha1
+lib/gltests/test-gc-md5
 lib/gltests/test-gc-pbkdf2-sha1
 lib/gltests/test-gc-sha1
 lib/gltests/test-getdelim
diff --git a/gl/m4/gettimeofday.m4 b/gl/m4/gettimeofday.m4
index 2155627..32e4f29 100644
--- a/gl/m4/gettimeofday.m4
+++ b/gl/m4/gettimeofday.m4
@@ -1,4 +1,4 @@
-# serial 13
+# serial 14
 
 # Copyright (C) 2001-2003, 2005, 2007, 2009-2010 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -14,30 +14,46 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY],
   AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS])
   AC_CHECK_FUNCS_ONCE([gettimeofday])
 
-  AC_CACHE_CHECK([for gettimeofday with POSIX signature],
-    [gl_cv_func_gettimeofday_posix_signature],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <sys/time.h>
-            struct timeval c;
-          ]],
-          [[
-            int (*f) (struct timeval *restrict, void *restrict) = gettimeofday;
-            int x = f (&c, 0);
-            return !(x | c.tv_sec | c.tv_usec);
-          ]])],
-        [gl_cv_func_gettimeofday_posix_signature=yes],
-        [gl_cv_func_gettimeofday_posix_signature=no])])
-
-  gl_FUNC_GETTIMEOFDAY_CLOBBER
-
-  if test $gl_cv_func_gettimeofday_posix_signature != yes; then
-    REPLACE_GETTIMEOFDAY=1
-    if test $gl_cv_func_gettimeofday_clobber != yes; then
+  gl_gettimeofday_timezone=void
+  if test $ac_cv_func_gettimeofday = yes; then
+    gl_FUNC_GETTIMEOFDAY_CLOBBER
+    AC_CACHE_CHECK([for gettimeofday with POSIX signature],
+      [gl_cv_func_gettimeofday_posix_signature],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[#include <sys/time.h>
+              struct timeval c;
+              int gettimeofday (struct timeval *restrict, void *restrict);
+            ]],
+            [[/* glibc uses struct timezone * rather than the POSIX void *
+                 if _GNU_SOURCE is defined.  However, since the only portable
+                 use of gettimeofday uses NULL as the second parameter, and
+                 since the glibc definition is actually more typesafe, it is
+                 not worth wrapping this to get a compliant signature.  */
+              int (*f) (struct timeval *restrict, void *restrict)
+                = gettimeofday;
+              int x = f (&c, 0);
+              return !(x | c.tv_sec | c.tv_usec);
+            ]])],
+          [gl_cv_func_gettimeofday_posix_signature=yes],
+          [AC_COMPILE_IFELSE(
+            [AC_LANG_PROGRAM(
+              [[#include <sys/time.h>
+int gettimeofday (struct timeval *restrict, struct timezone *restrict);
+              ]])],
+            [gl_cv_func_gettimeofday_posix_signature=almost],
+            [gl_cv_func_gettimeofday_posix_signature=no])])])
+    if test $gl_cv_func_gettimeofday_posix_signature = almost; then
+      gl_gettimeofday_timezone='struct timezone'
+    elif test $gl_cv_func_gettimeofday_posix_signature != yes; then
+      REPLACE_GETTIMEOFDAY=1
       AC_LIBOBJ([gettimeofday])
       gl_PREREQ_GETTIMEOFDAY
     fi
   fi
+  AC_DEFINE_UNQUOTED([GETTIMEOFDAY_TIMEZONE], [$gl_gettimeofday_timezone],
+    [Define this to 'void' or 'struct timezone' to match the system's
+     declaration of the second argument to gettimeofday.])
 ])
 
 
diff --git a/gltests/test-gettimeofday.c b/gltests/test-gettimeofday.c
index 2a07814..ff2bc72 100644
--- a/gltests/test-gettimeofday.c
+++ b/gltests/test-gettimeofday.c
@@ -20,7 +20,8 @@
 #include <sys/time.h>
 
 #include "signature.h"
-SIGNATURE_CHECK (gettimeofday, int, (struct timeval *, void *));
+SIGNATURE_CHECK (gettimeofday, int,
+                 (struct timeval *, GETTIMEOFDAY_TIMEZONE *));
 
 #include <time.h>
 
@@ -42,8 +43,5 @@ main (void)
       fprintf (stderr, "gettimeofday still clobbers the localtime buffer!\n");
       return 1;
     }
-  else
-    {
-      return 0;
-    }
+  return 0;
 }


hooks/post-receive
-- 
GNU gsasl