projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* wcwidth.m4 (gl_FUNC_WCWIDTH): Simplify by using AC_CHECK_DECLS.
[gnulib.git]
/
lib
/
getdate.y
diff --git
a/lib/getdate.y
b/lib/getdate.y
index
dafc0ea
..
0185048
100644
(file)
--- a/
lib/getdate.y
+++ b/
lib/getdate.y
@@
-1,7
+1,7
@@
%{
/* Parse a string into an internal time stamp.
%{
/* Parse a string into an internal time stamp.
- Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005 Free Software
+ Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005
, 2006
Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@
-87,8
+87,10
@@
of `digit' even when the host does not conform to POSIX. */
#define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9)
of `digit' even when the host does not conform to POSIX. */
#define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9)
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
-# define __attribute__(x)
+#ifndef __attribute__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
+# define __attribute__(x)
+# endif
#endif
#ifndef ATTRIBUTE_UNUSED
#endif
#ifndef ATTRIBUTE_UNUSED
@@
-1437,6
+1439,10
@@
get_date (struct timespec *result, char const *p, struct timespec const *now)
tm.tm_year = year;
tm.tm_mon = month;
tm.tm_mday = day;
tm.tm_year = year;
tm.tm_mon = month;
tm.tm_mday = day;
+ tm.tm_hour = tm0.tm_hour;
+ tm.tm_min = tm0.tm_min;
+ tm.tm_sec = tm0.tm_sec;
+ tm.tm_isdst = tm0.tm_isdst;
Start = mktime (&tm);
if (Start == (time_t) -1)
goto fail;
Start = mktime (&tm);
if (Start == (time_t) -1)
goto fail;