mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

Merge from gnulib, incorporating:

Browse Source 
2014-06-27 mktime: merge #if/#ifdef usage from glibc
* lib/mktime.c: Update from gnulib.
This commit is contained in:
Paul Eggert 2014-07-12 13:02:44 -07:00
parent b39c4d7b33
commit d105c56ff9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2014-07-12 Paul Eggert <eggert@cs.ucla.edu>
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 <dmantipov@yandex.ru>

4
lib/mktime.c
View File

@ -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_def (mktime)
libc_hidden_weak (timelocal)
#endif
#if DEBUG
#if defined DEBUG && DEBUG
static int
not_equal_tm (const struct tm *a, const struct tm *b)