[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117525: Merge from gnulib, incorporating:
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r117525: Merge from gnulib, incorporating: |
Date: |
Sat, 12 Jul 2014 20:02:48 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117525
revision-id: address@hidden
parent: address@hidden
author: Paul Eggert <address@hidden>
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2014-07-12 13:02:44 -0700
message:
Merge from gnulib, incorporating:
2014-06-27 mktime: merge #if/#ifdef usage from glibc
* lib/mktime.c: Update from gnulib.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
lib/mktime.c mktime.c-20110109015304-wm32754z0gtdsh7e-5
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-07-12 17:53:29 +0000
+++ b/ChangeLog 2014-07-12 20:02:44 +0000
@@ -1,5 +1,9 @@
2014-07-12 Paul Eggert <address@hidden>
+ Merge from gnulib, incorporating:
+ 2014-06-27 mktime: merge #if/#ifdef usage from glibc
+ * lib/mktime.c: Update from gnulib.
+
* Makefile.in (install-arch-indep): Avoid readdir race (Bug#17971).
2014-07-10 Dmitry Antipov <address@hidden>
=== modified file 'lib/mktime.c'
--- a/lib/mktime.c 2014-01-01 07:43:34 +0000
+++ b/lib/mktime.c 2014-07-12 20:02:44 +0000
@@ -38,7 +38,7 @@
#include <string.h> /* For the real memcpy prototype. */
-#if DEBUG
+#if defined DEBUG && DEBUG
# include <stdio.h>
# include <stdlib.h>
/* Make it work even if the system's libc has its own mktime routine. */
@@ -600,7 +600,7 @@
libc_hidden_weak (timelocal)
#endif
-#if DEBUG
+#if defined DEBUG && DEBUG
static int
not_equal_tm (const struct tm *a, const struct tm *b)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117525: Merge from gnulib, incorporating:,
Paul Eggert <=