projects
/
debian
/
gzip
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
should mention the lintian comment in the changelog...
[debian/gzip]
/
lib
/
gettimeofday.c
diff --git
a/lib/gettimeofday.c
b/lib/gettimeofday.c
index ce2e9b6ebc4069dbe4c1e00452cc1888a064cfb9..ad65c6da8be7b44c75e9ff9ed3056be776dd267d 100644
(file)
--- a/
lib/gettimeofday.c
+++ b/
lib/gettimeofday.c
@@
-1,9
+1,6
@@
-/* -*- buffer-read-only: t -*- vi: set ro: */
-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
/* Provide gettimeofday for systems that don't have it or for which it's broken.
/* Provide gettimeofday for systems that don't have it or for which it's broken.
- Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2009 Free Software
- Foundation, Inc.
+ Copyright (C) 2001-2003, 2005-2007, 2009-2013 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
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
@@
-16,8
+13,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program; if not, see <http://www.gnu.org/licenses/>. */
/* written by Jim Meyering */
/* written by Jim Meyering */
@@
-43,10
+39,10
@@
static struct tm tm_zero_buffer;
static struct tm *localtime_buffer_addr = &tm_zero_buffer;
static struct tm tm_zero_buffer;
static struct tm *localtime_buffer_addr = &tm_zero_buffer;
-#undef localtime
+#
undef localtime
extern struct tm *localtime (time_t const *);
extern struct tm *localtime (time_t const *);
-#undef gmtime
+#
undef gmtime
extern struct tm *gmtime (time_t const *);
/* This is a wrapper for localtime. It is used only on systems for which
extern struct tm *gmtime (time_t const *);
/* This is a wrapper for localtime. It is used only on systems for which
@@
-82,7
+78,7
@@
rpl_gmtime (time_t const *timep)
#if TZSET_CLOBBERS_LOCALTIME
#if TZSET_CLOBBERS_LOCALTIME
-#undef tzset
+#
undef tzset
extern void tzset (void);
/* This is a wrapper for tzset, for systems on which tzset may clobber
extern void tzset (void);
/* This is a wrapper for tzset, for systems on which tzset may clobber
@@
-103,7
+99,7
@@
rpl_tzset (void)
causes problems. */
int
causes problems. */
int
-
rpl_
gettimeofday (struct timeval *restrict tv, void *restrict tz)
+gettimeofday (struct timeval *restrict tv, void *restrict tz)
{
#undef gettimeofday
#if HAVE_GETTIMEOFDAY
{
#undef gettimeofday
#if HAVE_GETTIMEOFDAY
@@
-113,7
+109,18
@@
rpl_gettimeofday (struct timeval *restrict tv, void *restrict tz)
struct tm save = *localtime_buffer_addr;
# endif
struct tm save = *localtime_buffer_addr;
# endif
+# if defined timeval /* 'struct timeval' overridden by gnulib? */
+# undef timeval
+ struct timeval otv;
+ int result = gettimeofday (&otv, (struct timezone *) tz);
+ if (result == 0)
+ {
+ tv->tv_sec = otv.tv_sec;
+ tv->tv_usec = otv.tv_usec;
+ }
+# else
int result = gettimeofday (tv, (struct timezone *) tz);
int result = gettimeofday (tv, (struct timezone *) tz);
+# endif
# if GETTIMEOFDAY_CLOBBERS_LOCALTIME
*localtime_buffer_addr = save;
# if GETTIMEOFDAY_CLOBBERS_LOCALTIME
*localtime_buffer_addr = save;