* editfns.c, systime.h (mktime_z) [!HAVE_TZALLOC]: Now static.

diff --git a/src/ChangeLog b/src/ChangeLog
index 517052590c3b8166ada0f7a9b4977e6b30178d57..0c32b74fdba994e7221d87fead101a908d3ffed9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * editfns.c, systime.h (mktime_z) [!HAVE_TZALLOC]: Now static.
+
 2015-03-12  Eli Zaretskii  <eliz@gnu.org>
 
        * w32font.c (font_supported_scripts): Add subranges for Latin

diff --git a/src/editfns.c b/src/editfns.c
index dbcb3160b2734e60bb28b17ffce254e259c54b5c..7c146f13e14ff69205ee7588622e412f9e514428 100644 (file)
--- 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 4787c512aaa4c0eb3e8b8b54b3d215b6e1ac38a1..744af17b640dd94c49b712c61488b3139074e0f6 100644 (file)
--- 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