From 2c59be9c67e50f70f0407794bfe79038ded58a72 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 13 Mar 2015 09:55:59 -0700 Subject: [PATCH] * editfns.c, systime.h (mktime_z) [!HAVE_TZALLOC]: Now static. --- src/ChangeLog | 4 ++++ src/editfns.c | 2 +- src/systime.h | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 517052590c3..0c32b74fdba 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2015-03-13 Paul Eggert + + * editfns.c, systime.h (mktime_z) [!HAVE_TZALLOC]: Now static. + 2015-03-12 Eli Zaretskii * w32font.c (font_supported_scripts): Add subranges for Latin diff --git a/src/editfns.c b/src/editfns.c index dbcb3160b27..7c146f13e14 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1411,7 +1411,7 @@ check_time_validity (int validity) /* A substitute for mktime_z on platforms that lack it. It's not thread-safe, but should be good enough for Emacs in typical use. */ #ifndef HAVE_TZALLOC -time_t +static time_t mktime_z (timezone_t tz, struct tm *tm) { char *oldtz = getenv ("TZ"); diff --git a/src/systime.h b/src/systime.h index 4787c512aaa..744af17b640 100644 --- a/src/systime.h +++ b/src/systime.h @@ -118,8 +118,6 @@ extern struct timespec lisp_time_argument (Lisp_Object); typedef char const *timezone_t; INLINE timezone_t tzalloc (char const *name) { return name; } INLINE void tzfree (timezone_t tz) { } -/* Defined in editfns.c. */ -extern time_t mktime_z (timezone_t, struct tm *); #endif INLINE_HEADER_END -- 2.39.2