From 0e698b54a2d85bddf2bb04ecb60435da4b1bcf11 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 23 Feb 2007 18:25:21 +0000 Subject: [PATCH] * lib/getdate.h (includes): Include , not "timespec.h". * lib/stat-time.h (includes): Likewise. * lib/utimecmp.c (includes): Likewise. * lib/utimens.h (includes): Likewise. * lib/getdate.y (includes): Also include "timespec.h" for use internal to the module. * modules/utimens (Depends-on): Revert yesterday's patch. * modules/nanosleep (Depends-on): Add missing dependency. --- ChangeLog | 15 +++++++++++++-- lib/getdate.h | 5 +++-- lib/getdate.y | 3 ++- lib/stat-time.h | 4 ++-- lib/utimecmp.c | 4 ++-- lib/utimens.h | 2 +- modules/nanosleep | 1 + modules/utimens | 1 - 8 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f1cfa508..0bfc9d9e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-02-23 Eric Blake + + * lib/getdate.h (includes): Include , not "timespec.h". + * lib/stat-time.h (includes): Likewise. + * lib/utimecmp.c (includes): Likewise. + * lib/utimens.h (includes): Likewise. + * lib/getdate.y (includes): Also include "timespec.h" for use + internal to the module. + * modules/utimens (Depends-on): Revert yesterday's patch. + * modules/nanosleep (Depends-on): Add missing dependency. + 2007-02-22 Bruno Haible * lib/glob.c: Don't include getlogin_r.h. @@ -369,7 +380,7 @@ long lines. 2007-02-17 Ben Pfaff - Bruno Haible + Bruno Haible * modules/tmpfile: New file. * lib/tmpfile.c: New file. @@ -963,7 +974,7 @@ 2007-02-03 Jim Meyering - Give tools a better chance to allocate space for very large buffers. + Give tools a better chance to allocate space for very large buffers. * lib/xalloc.h (x2nrealloc): Use 3/2, not 2, as buffer size factor. Make pwd and readlink work also when run with an unreadable parent dir diff --git a/lib/getdate.h b/lib/getdate.h index 4694cdb66..142231e28 100644 --- a/lib/getdate.h +++ b/lib/getdate.h @@ -1,6 +1,7 @@ /* Parse a string into an internal time stamp. - Copyright (C) 1995, 1997, 1998, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1995, 1997, 1998, 2003, 2004, 2007 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 @@ -17,6 +18,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include -#include "timespec.h" +#include bool get_date (struct timespec *, char const *, struct timespec const *); diff --git a/lib/getdate.y b/lib/getdate.y index 15073107b..cbf3ca104 100644 --- a/lib/getdate.y +++ b/lib/getdate.y @@ -1,7 +1,7 @@ %{ /* Parse a string into an internal time stamp. - Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software + Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -35,6 +35,7 @@ #include #include "getdate.h" +#include "timespec.h" /* There's no need to extend the stack, so there's no need to involve alloca. */ diff --git a/lib/stat-time.h b/lib/stat-time.h index 734e36657..5fd18c1fa 100644 --- a/lib/stat-time.h +++ b/lib/stat-time.h @@ -1,6 +1,6 @@ /* stat-related time functions. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2007 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 @@ -21,7 +21,7 @@ #ifndef STAT_TIME_H #define STAT_TIME_H 1 -#include "timespec.h" +#include /* STAT_TIMESPEC (ST, ST_XTIM) is the ST_XTIM member for *ST of type struct timespec, if available. If not, then STAT_TIMESPEC_NS (ST, diff --git a/lib/utimecmp.c b/lib/utimecmp.c index e0bfcb635..051d03a10 100644 --- a/lib/utimecmp.c +++ b/lib/utimecmp.c @@ -1,6 +1,6 @@ /* utimecmp.c -- compare file time stamps - Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006, 2007 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 @@ -26,10 +26,10 @@ #include #include #include +#include #include "hash.h" #include "intprops.h" #include "stat-time.h" -#include "timespec.h" #include "utimens.h" #include "verify.h" #include "xalloc.h" diff --git a/lib/utimens.h b/lib/utimens.h index d42d792c2..0097aaaf7 100644 --- a/lib/utimens.h +++ b/lib/utimens.h @@ -1,3 +1,3 @@ -#include "timespec.h" +#include int futimens (int, char const *, struct timespec const [2]); int utimens (char const *, struct timespec const [2]); diff --git a/modules/nanosleep b/modules/nanosleep index e7dfac413..3035a137a 100644 --- a/modules/nanosleep +++ b/modules/nanosleep @@ -8,6 +8,7 @@ m4/nanosleep.m4 Depends-on: clock-time extensions +gettime stdbool sys_time time diff --git a/modules/utimens b/modules/utimens index abaf78319..caf8805d6 100644 --- a/modules/utimens +++ b/modules/utimens @@ -11,7 +11,6 @@ m4/utimes.m4 Depends-on: sys_time time -timespec configure.ac: gl_UTIMENS -- 2.11.0