--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-20  Jim Meyering  <meyering@redhat.com>
+
+	gettimeofday: move more declarations out of functions
+	* lib/gettimeofday.c: Move extern declarations of tzset and
+	gmtime out of containing functions.  Prompted by Bruno Haible.
+
 2009-01-20  Paolo Bonzini  <bonzini@gnu.org>
 
 	regex: do not depend on obsolete modules.

--- a/lib/gettimeofday.c
+++ b/lib/gettimeofday.c
@@ -44,6 +44,9 @@
 #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.
 
@@ -65,8 +68,6 @@
 struct tm *
 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)
@@ -78,14 +79,15 @@
 #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
 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;