Commit d105c56f authored by Paul Eggert's avatar Paul Eggert

Merge from gnulib, incorporating:

2014-06-27 mktime: merge #if/#ifdef usage from glibc
* lib/mktime.c: Update from gnulib.
parent b39c4d7b
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>
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment