Imported Upstream version 3.3.1

[debian/amanda] / gnulib / gettimeofday.c

diff --git a/gnulib/gettimeofday.c b/gnulib/gettimeofday.c
index bd5576cb0993823f92f96a8f05b876cd78d6e771..74fc55813979034a3628eb7ccc1329bb14569099 100644 (file)
--- a/gnulib/gettimeofday.c
+++ b/gnulib/gettimeofday.c
@@ -1,11 +1,10 @@
 /* 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 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007, 2009-2010 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

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -41,6 +40,12 @@
 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
+extern struct tm *localtime (time_t const *);
+
+#undef gmtime
+extern struct tm *gmtime (time_t const *);
+

 /* This is a wrapper for localtime.  It is used only on systems for which
    gettimeofday clobbers the static buffer used for localtime's result.
 
 /* This is a wrapper for localtime.  It is used only on systems for which
    gettimeofday clobbers the static buffer used for localtime's result.
 


@@ -48,10 +53,8 @@ static struct tm *localtime_buffer_addr = &tm_zero_buffer;
    localtime uses for its result.  */
 
 struct tm *
    localtime uses for its result.  */
 
 struct tm *

-localtime (time_t const *timep)
+rpl_localtime (time_t const *timep)

 {
 {

-#undef localtime
-  extern struct tm *localtime (time_t const *);

   struct tm *tm = localtime (timep);
 
   if (localtime_buffer_addr == &tm_zero_buffer)
   struct tm *tm = localtime (timep);
 
   if (localtime_buffer_addr == &tm_zero_buffer)


@@ -62,10 +65,8 @@ localtime (time_t const *timep)
 
 /* Same as above, since gmtime and localtime use the same buffer.  */
 struct tm *
 
 /* Same as above, since gmtime and localtime use the same buffer.  */
 struct tm *

-gmtime (time_t const *timep)
+rpl_gmtime (time_t const *timep)

 {
 {

-#undef gmtime
-  extern struct tm *gmtime (time_t const *);

   struct tm *tm = gmtime (timep);
 
   if (localtime_buffer_addr == &tm_zero_buffer)
   struct tm *tm = gmtime (timep);
 
   if (localtime_buffer_addr == &tm_zero_buffer)


@@ -77,14 +78,15 @@ gmtime (time_t const *timep)
 #endif /* GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME */
 
 #if TZSET_CLOBBERS_LOCALTIME
 #endif /* GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME */
 
 #if TZSET_CLOBBERS_LOCALTIME

+
+#undef tzset
+extern void tzset (void);
+

 /* This is a wrapper for tzset, for systems on which tzset may clobber
    the static buffer used for localtime's result.  */
 void
 /* This is a wrapper for tzset, for systems on which tzset may clobber
    the static buffer used for localtime's result.  */
 void

-tzset (void)
+rpl_tzset (void)

 {
 {

-#undef tzset
-  extern void tzset (void);
-

   /* Save and restore the contents of the buffer used for localtime's
      result around the call to tzset.  */
   struct tm save = *localtime_buffer_addr;
   /* Save and restore the contents of the buffer used for localtime's
      result around the call to tzset.  */
   struct tm save = *localtime_buffer_addr;


@@ -98,7 +100,7 @@ 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


@@ -108,7 +110,7 @@ rpl_gettimeofday (struct timeval *restrict tv, void *restrict tz)
   struct tm save = *localtime_buffer_addr;
 # endif
 
   struct tm save = *localtime_buffer_addr;
 # endif
 

-  int result = gettimeofday (tv, tz);
+  int result = gettimeofday (tv, (struct timezone *) tz);

 
 # if GETTIMEOFDAY_CLOBBERS_LOCALTIME
   *localtime_buffer_addr = save;
 
 # if GETTIMEOFDAY_CLOBBERS_LOCALTIME
   *localtime_buffer_addr = save;