[Guile-commits] GNU Guile branch, branch_release-1-8, updated. release_1-8-6-48-g1011599

[Ludovic Courtès]

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

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=1011599792302b356195663a3efd68a234c11f69

The branch, branch_release-1-8 has been updated
       via  1011599792302b356195663a3efd68a234c11f69 (commit)
       via  5d8f339fd8203f5e2fe001a49592ae12b26b5b67 (commit)
      from  2b76a655663640863319c7c1f39914dabd527291 (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 1011599792302b356195663a3efd68a234c11f69
Author: Ludovic Courtès <address@hidden>
Date:   Tue May 12 00:01:30 2009 +0200

    Better diagnose broken `(strftime "%z" ...)' in `time.test' (bug #24130).
    
    * test-suite/tests/time.test ("strftime")["C99 %z
      format"](have-strftime-%z): Better diagnose broken "%z" on Tru64 5.1b
      and AIX.  Closes bug #24130.
    
    * NEWS: Update.

commit 5d8f339fd8203f5e2fe001a49592ae12b26b5b67
Author: Ludovic Courtès <address@hidden>
Date:   Mon May 11 22:54:45 2009 +0200

    Work around lack of flock(2) declaration on Tru64 5.1b.
    
    * configure.in: Check for the declaration of flock(2).
    
    * libguile/posix.c [!__MINGW32__][!HAVE_DECL_FLOCK]: Provide an flock(2)
      declaration, needed on Tru64 5.1b.

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

Summary of changes:
 NEWS                       |    1 +
 configure.in               |    4 +++-
 libguile/posix.c           |    7 +++++++
 test-suite/tests/time.test |   11 ++++++-----
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index fa92e32..b941dfe 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ Changes in 1.8.7 (since 1.8.6)
 ** Fix build when compiled with -Wundef -Werror
 ** More build fixes for `alphaev56-dec-osf5.1b' (Tru64)
 ** With GCC, always compile with `-mieee' on `alpha*' and `sh*'
+** Better diagnose broken `(strftime "%z" ...)' in `time.test' (bug #24130)
 
 ** Allow @ macro to work with (ice-9 syncase)
 
diff --git a/configure.in b/configure.in
index 721394b..793bf93 100644
--- a/configure.in
+++ b/configure.in
@@ -774,10 +774,12 @@ AC_CHECK_FUNCS([DINFINITY DQNAN cexp chsize clog clog10 
ctermid fesetround ftime
 #       declaration isn't anywhere.
 #   cuserid - on Tru64 5.1b the declaration is documented to be available
 #       only with `_XOPEN_SOURCE' or some such.
+#   flock - on Tru64 5.1b the declaration is available from <sys/fcntl.h>
+#       but only if `_BSD' is defined.
 #
 AC_CHECK_HEADERS(crypt.h netdb.h pthread.h sys/param.h sys/resource.h 
sys/file.h)
 AC_CHECK_FUNCS(chroot flock getlogin cuserid getpriority setpriority getpass 
sethostname gethostname)
-AC_CHECK_DECLS([sethostname, strncasecmp, unsetenv, hstrerror, cuserid])
+AC_CHECK_DECLS([sethostname, strncasecmp, unsetenv, hstrerror, cuserid, flock])
 
 # crypt() may or may not be available, for instance in some countries there
 # are restrictions on cryptography.
diff --git a/libguile/posix.c b/libguile/posix.c
index f036f57..2ecd8ae 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -1856,6 +1856,13 @@ static int flock (int fd, int operation)
 #endif /* __MINGW32__ */
 
 #if HAVE_FLOCK || defined (__MINGW32__)
+
+#ifndef __MINGW32__
+# if !HAVE_DECL_FLOCK
+extern int flock (int, int);
+# endif
+#endif
+
 SCM_DEFINE (scm_flock, "flock", 2, 0, 0, 
             (SCM file, SCM operation),
            "Apply or remove an advisory lock on an open file.\n"
diff --git a/test-suite/tests/time.test b/test-suite/tests/time.test
index ebc4499..0007952 100644
--- a/test-suite/tests/time.test
+++ b/test-suite/tests/time.test
@@ -1,7 +1,7 @@
 ;;;; time.test --- test suite for Guile's time functions     -*- scheme -*-
 ;;;; Jim Blandy <address@hidden> --- June 1999, 2004
 ;;;;
-;;;;   Copyright (C) 1999, 2004, 2006, 2007 Free Software Foundation, Inc.
+;;;;   Copyright (C) 1999, 2004, 2006, 2007, 2009 Free Software Foundation, 
Inc.
 ;;;; 
 ;;;; This program is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -222,12 +222,13 @@
 
     ;; C99 spec is empty string if no zone determinable
     ;;
-    ;; on pre-C99 systems not sure what to expect if %z unsupported, probably
-    ;; "%z" unchanged in C99 if timezone
+    ;; On pre-C99 systems not sure what to expect if %z unsupported, probably
+    ;; "%z" unchanged in C99 if timezone.  On AIX and Tru64 5.1b, it returns
+    ;; a string such as "GMT" or "EST", instead of "+0000" or "-0500".  See
+    ;; https://savannah.gnu.org/bugs/index.php?24130 for details.
     ;;
     (define have-strftime-%z
-      (not (member (strftime "%z" (gmtime 0))
-                  '("" "%z"))))
+      (equal? (strftime "%z" (gmtime 0)) "+0000"))
 
     ;; %z here is quite possibly affected by the same tm:gmtoff vs current
     ;; zone as %Z above is, so in the following tests we make them the same.


hooks/post-receive
-- 
GNU Guile