From: Eric Blake Date: Mon, 2 Nov 2009 18:39:38 +0000 (-0700) Subject: mktime, timegm: share common declaration X-Git-Tag: v0.1~5259 X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=2bb0a0edbbd82ecf0ab945cdf907423109d736c7;p=gnulib.git 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 --- diff --git a/ChangeLog b/ChangeLog index ebbf68fe8..3dfebc59c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,20 @@ 2009-11-02 Eric Blake + 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 - Simon Josefsson - Bruno Haible + Simon Josefsson + Bruno Haible 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 - Bruno Haible + Bruno Haible * 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 index 000000000..4287acf4a --- /dev/null +++ b/lib/mktime-internal.h @@ -0,0 +1,4 @@ +#include +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 869032981..b9b961ffd 100644 --- 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 67230cf34..94d3fa098 100644 --- 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 7a5165bbd..037f4e475 100644 --- 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 27eab44ec..f1de72643 100644 --- 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