diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-10-07 22:30:13 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-10-08 11:28:25 -0700 |
| commit | 5a580643111ef6081be7b4c7bd1997a5447c903f (patch) | |
| tree | bdf64e7fab4c531aafd7afc852e9239f177346b4 | |
| parent | c892ae04f47908479220247a311bc0067229b592 (diff) | |
| download | glibc-5a580643111ef6081be7b4c7bd1997a5447c903f.tar.gz glibc-5a580643111ef6081be7b4c7bd1997a5447c903f.tar.xz glibc-5a580643111ef6081be7b4c7bd1997a5447c903f.zip | |
mktime fix for Gnulib + coreutils
[BZ#23745] This fix affects only Gnulib. Problem discovered when mktime.c was used as part of Gnulib in bleeding-edge Coreutils. * time/mktime.c: (my_tzset) [!_LIBC && !NEED_MKTIME_WORKING && !NEED_MKTIME_WINDOWS]: Do not define since it is not used. Defining an unused static function prompts a warning from GCC when Coreutils is configured with --enable-gcc-warnings.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | time/mktime.c | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index af0f15b468..cadf8613f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2018-10-08 Paul Eggert <eggert@cs.ucla.edu> + + mktime fix for Gnulib + coreutils + [BZ#23745] + This fix affects only Gnulib. Problem discovered when + mktime.c was used as part of Gnulib in bleeding-edge Coreutils. + * time/mktime.c: + (my_tzset) [!_LIBC && !NEED_MKTIME_WORKING && !NEED_MKTIME_WINDOWS]: + Do not define since it is not used. Defining an unused static + function prompts a warning from GCC when Coreutils is configured + with --enable-gcc-warnings. + 2018-10-08 Leonardo Sandoval <leonardo.sandoval.gonzalez@intel.com> * benchtests/scripts/compare_bench.py (main): set float type on diff --git a/time/mktime.c b/time/mktime.c index 1404ee9f1f..00f0dec6b4 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -78,7 +78,7 @@ #include "mktime-internal.h" -#ifndef _LIBC +#if !defined _LIBC && (NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS) static void my_tzset (void) { |