1
0
mirror of https://git.savannah.gnu.org/git/gnulib.git synced 2025-09-11 11:50:52 +03:00

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>
This commit is contained in:
Eric Blake
2009-11-02 11:39:38 -07:00
parent 00a29a1b89
commit 2bb0a0edbb
6 changed files with 20 additions and 10 deletions

View File

@@ -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.

4
lib/mktime-internal.h Normal file
View File

@@ -0,0 +1,4 @@
#include <time.h>
time_t mktime_internal (struct tm *,
struct tm * (*) (time_t const *, struct tm *),
time_t *);

View File

@@ -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) -

View File

@@ -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

View File

@@ -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

View File

@@ -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