mktime, timegm: share common declaration

* lib/mktime-internal.h: New file.
* lib/mktime.c: Use it rather than open-coding a declaration.
* lib/timegm.c: Likewise.
* modules/mktime (Files): Ship it.
* modules/timegm (Files): Likewise.
Suggested by Bruno Haible.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index ebbf68fe863661be71a0f89c3cbe6ccad07d9214..3dfebc59c69df59aee39d338099723bc6b236b70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,20 @@
 2009-11-02  Eric Blake  <ebb9@byu.net>
 
+       mktime, timegm: share common declaration
+       * lib/mktime-internal.h: New file.
+       * lib/mktime.c: Use it rather than open-coding a declaration.
+       * lib/timegm.c: Likewise.
+       * modules/mktime (Files): Ship it.
+       * modules/timegm (Files): Likewise.
+       Suggested by Bruno Haible.
+
        test-update-copyright: update test to match script changes
        * tests/test-update-copyright.sh: Avoid hard-coding perl
        location.  Don't update *.bak created by earlier runs.
 
 2009-11-02  Paul Eggert  <eggert@cs.ucla.edu>
-            Simon Josefsson  <simon@josefsson.org>
-            Bruno Haible  <bruno@clisp.org>
+           Simon Josefsson  <simon@josefsson.org>
+           Bruno Haible  <bruno@clisp.org>
 
        Fix link error on Solaris 8.
        * m4/inet_pton.m4 (gl_INET_PTON): Search for the function inet_pton
@@ -14,7 +22,7 @@
        * modules/inet_pton (Link): New section.
 
 2009-11-02  Simon Josefsson  <simon@josefsson.org>
-            Bruno Haible  <bruno@clisp.org>
+           Bruno Haible  <bruno@clisp.org>
 
        * m4/inet_ntop.m4 (gl_INET_NTOP): Define also INET_NTOP_LIB.
        * modules/inet_ntop (Link): New section.

diff --git a/lib/mktime-internal.h b/lib/mktime-internal.h
new file mode 100644 (file)
index 0000000..4287acf
--- /dev/null
+++ b/lib/mktime-internal.h
@@ -0,0 +1,4 @@
+#include <time.h>
+time_t mktime_internal (struct tm *,
+                        struct tm * (*) (time_t const *, struct tm *),
+                        time_t *);

diff --git a/lib/mktime.c b/lib/mktime.c
index 8690329816b07162a04f5f156b91225c8a6b608b..b9b961ffd899ad2e0b40bcfa7a574245bf2254a6 100644 (file)
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -147,9 +147,7 @@ const unsigned short int __mon_yday[2][13] =
 # undef __localtime_r
 # define __localtime_r localtime_r
 # define __mktime_internal mktime_internal
-time_t __mktime_internal (struct tm *,
-                         struct tm * (*) (time_t const *, struct tm *),
-                         time_t *);
+# include "mktime-internal.h"
 #endif
 
 /* Return an integer value measuring (YEAR1-YDAY1 HOUR1:MIN1:SEC1) -

diff --git a/lib/timegm.c b/lib/timegm.c
index 67230cf34b7ea19b9893c82c12f9dabaf5d2fe2b..94d3fa0986bc6a5371630db6413ffea335e6e254 100644 (file)
--- a/lib/timegm.c
+++ b/lib/timegm.c
@@ -1,6 +1,6 @@
 /* Convert UTC calendar time to simple time.  Like mktime but assumes UTC.
 
-   Copyright (C) 1994, 1997, 2003, 2004, 2006, 2007 Free Software
+   Copyright (C) 1994, 1997, 2003, 2004, 2006, 2007, 2009 Free Software
    Foundation, Inc.  This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -27,9 +27,7 @@
 # undef __gmtime_r
 # define __gmtime_r gmtime_r
 # define __mktime_internal mktime_internal
-time_t __mktime_internal (struct tm *,
-                         struct tm * (*) (time_t const *, struct tm *),
-                         time_t *);
+# include "mktime-internal.h"
 #endif
 
 time_t

diff --git a/modules/mktime b/modules/mktime
index 7a5165bbd89a31f28c8f03bd4cff0fba19ad0c24..037f4e475d639e57180613b48f1dc58bb60046c7 100644 (file)
--- a/modules/mktime
+++ b/modules/mktime
@@ -2,6 +2,7 @@ Description:
 mktime() function: convert broken-down time to linear time.
 
 Files:
+lib/mktime-internal.h
 lib/mktime.c
 m4/mktime.m4
 

diff --git a/modules/timegm b/modules/timegm
index 27eab44ec753a5790331e004f640f01b30394f4c..f1de7264357e8c1dcbc38a8b92b052134faf82ca 100644 (file)
--- a/modules/timegm
+++ b/modules/timegm
@@ -2,6 +2,7 @@ Description:
 Convert calendar time to simple time, inverse of mktime.
 
 Files:
+lib/mktime-internal.h
 lib/timegm.c
 m4/timegm.m4