mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-07 13:28:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync up mktime with gnulib

Browse Source 
From the gnulib commit log:

commit e2646b0c6b5acda25e9ffeb4c12a5513a1e3b5ac
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Fri Jun 27 11:35:44 2014 -0700

    mktime: merge #if/#ifdef usage from glibc

    * lib/mktime.c: Use "#if defined DEBUG && DEBUG", not "#if DEBUG",
    as that works with both Glibc's and Gnulib's style.
    See thread starting at Siddhesh Poyarekar's bug report at:
    http://lists.gnu.org/archive/html/bug-gnulib/2014-06/msg00102.html
This commit is contained in:
Paul Eggert 2014-06-28 06:15:54 +05:30 committed by Siddhesh Poyarekar
parent 64df73c2ea
commit dd0ba01812
2 changed files with 10 additions and 2 deletions

8
ChangeLog
View File

@ -1,3 +1,11 @@
2014-06-28 Paul Eggert <eggert@cs.ucla.edu>
mktime: merge #if/#ifdef usage from glibc
* lib/mktime.c: Use "#if defined DEBUG && DEBUG", not "#if DEBUG",
as that works with both Glibc's and Gnulib's style.
See thread starting at Siddhesh Poyarekar's bug report at:
http://lists.gnu.org/archive/html/bug-gnulib/2014-06/msg00102.html
2014-06-28 Siddhesh Poyarekar <siddhesh@redhat.com> 2014-06-28 Siddhesh Poyarekar <siddhesh@redhat.com>
* sysdeps/generic/memcopy.h: Define MEMCPY_OK_FOR_FWD_MEMMOVE. * sysdeps/generic/memcopy.h: Define MEMCPY_OK_FOR_FWD_MEMMOVE.

4
time/mktime.c
View File

@ -38,7 +38,7 @@
#include <string.h> /* For the real memcpy prototype. */ #include <string.h> /* For the real memcpy prototype. */
#if DEBUG #if defined DEBUG && DEBUG
# include <stdio.h> # include <stdio.h>
# include <stdlib.h> # include <stdlib.h>
/* Make it work even if the system's libc has its own mktime routine. */ /* 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) libc_hidden_weak (timelocal)
#endif #endif
#if DEBUG #if defined DEBUG && DEBUG
static int static int
not_equal_tm (const struct tm *a, const struct tm *b) not_equal_tm (const struct tm *a, const struct tm *b)