[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 2c59be9 1/2: * editfns.c, systime.h (mktime_z) [!HA
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 2c59be9 1/2: * editfns.c, systime.h (mktime_z) [!HAVE_TZALLOC]: Now static. |
Date: |
Fri, 13 Mar 2015 16:58:44 +0000 |
branch: master
commit 2c59be9c67e50f70f0407794bfe79038ded58a72
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
* 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 5170525..0c32b74 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-13 Paul Eggert <address@hidden>
+
+ * editfns.c, systime.h (mktime_z) [!HAVE_TZALLOC]: Now static.
+
2015-03-12 Eli Zaretskii <address@hidden>
* w32font.c (font_supported_scripts): Add subranges for Latin
diff --git a/src/editfns.c b/src/editfns.c
index dbcb316..7c146f1 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 4787c51..744af17 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