[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] gettimeofday: avoid warning: nested extern declaration of 'l
From: |
Jim Meyering |
Subject: |
Re: [PATCH] gettimeofday: avoid warning: nested extern declaration of 'localtime' |
Date: |
Mon, 19 Jan 2009 12:17:43 +0100 |
Bruno Haible <address@hidden> wrote:
> Jim Meyering wrote:
>> FYI, I've just pushed this:
>> * lib/gettimeofday.c: Move extern declaration out of function.
>
> Why not also do the same thing with the 'gmtime' declaration in the same file?
Thanks. I didn't see that.
tzset's too:
>From 8396579b2baa56fa38e8011ba7209abed19822dc Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Mon, 19 Jan 2009 12:16:07 +0100
Subject: [PATCH] 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.
---
ChangeLog | 6 ++++++
lib/gettimeofday.c | 12 +++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fde11b5..3a3754e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-19 Jim Meyering <address@hidden>
+
+ 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-19 Daniel P. Berrange <address@hidden>
ioctl: avoid warning: no previous prototype for 'rpl_ioctl'
diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
index badbf64..7e711f7 100644
--- a/lib/gettimeofday.c
+++ b/lib/gettimeofday.c
@@ -44,6 +44,9 @@ 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.
@@ -65,8 +68,6 @@ rpl_localtime (time_t const *timep)
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 @@ rpl_gmtime (time_t const *timep)
#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;
--
1.6.1.331.g9c367