diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-09-02 00:07:27 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-09-02 01:37:37 +0200 |
| commit | 5f236208d0d864546e59afa0f5a11c9b3ba14b10 (patch) | |
| tree | eed5d9203a2633c8efb85c1b36425eab87574299 /lib/time.in.h | |
| parent | f0eb5ae6c173aed35965b0561897fda1d8ff0db1 (diff) | |
| parent | d7e7a02a6251c8ed4f76933d9d30baeee3f599c0 (diff) | |
| download | guile-bdw-gc-static-alloc.tar.gz | |
Merge branch 'boehm-demers-weiser-gc' into bdw-gc-static-allocbdw-gc-static-alloc
Conflicts:
acinclude.m4
libguile/strings.c
Diffstat (limited to 'lib/time.in.h')
| -rw-r--r-- | lib/time.in.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/time.in.h b/lib/time.in.h index 7da429a54..cef4e0546 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -1,6 +1,6 @@ /* A more-standard <time.h>. - Copyright (C) 2007-2008 Free Software Foundation, Inc. + Copyright (C) 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 Lesser General Public License as published by @@ -66,6 +66,12 @@ struct timespec int nanosleep (struct timespec const *__rqtp, struct timespec *__rmtp); # endif +/* Return the 'time_t' representation of TP and normalize TP. */ +# if @REPLACE_MKTIME@ +# define mktime rpl_mktime +extern time_t mktime (struct tm *__tp); +# endif + /* Convert TIMER to RESULT, assuming local time and UTC respectively. See <http://www.opengroup.org/susv3xsh/localtime_r.html> and <http://www.opengroup.org/susv3xsh/gmtime_r.html>. */ |