From ae43baf942b4bbe07a710f8c7a835f6c4854d05f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 18 Sep 2018 12:19:02 -0700 Subject: [PATCH 1/2] gettime: nanotime never existed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem reported by Bruno Haible in: https://lists.gnu.org/r/bug-gnulib/2018-09/msg00082.html * lib/gettime.c (gettime) [HAVE_NANOTIME]: Remove unused code. * m4/gettime.m4 (gl_GETTIME): Don’t check for nanotime. --- ChangeLog | 8 ++++++++ lib/gettime.c | 2 -- m4/gettime.m4 | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2661001fe..ae7b010a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2018-09-18 Paul Eggert + + gettime: nanotime never existed + Problem reported by Bruno Haible in: + https://lists.gnu.org/r/bug-gnulib/2018-09/msg00082.html + * lib/gettime.c (gettime) [HAVE_NANOTIME]: Remove unused code. + * m4/gettime.m4 (gl_GETTIME): Don’t check for nanotime. + 2018-09-18 Bruno Haible doc: Update statement about target platforms. diff --git a/lib/gettime.c b/lib/gettime.c index 171f22476..bb59c44ff 100644 --- a/lib/gettime.c +++ b/lib/gettime.c @@ -30,8 +30,6 @@ gettime (struct timespec *ts) { #if defined CLOCK_REALTIME && HAVE_CLOCK_GETTIME clock_gettime (CLOCK_REALTIME, ts); -#elif HAVE_NANOTIME - nanotime (ts); #else struct timeval tv; gettimeofday (&tv, NULL); diff --git a/m4/gettime.m4 b/m4/gettime.m4 index ad355463c..671b70d5a 100644 --- a/m4/gettime.m4 +++ b/m4/gettime.m4 @@ -1,4 +1,4 @@ -# gettime.m4 serial 8 +# gettime.m4 serial 9 dnl Copyright (C) 2002, 2004-2006, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,5 +9,5 @@ AC_DEFUN([gl_GETTIME], dnl Prerequisites of lib/gettime.c. AC_REQUIRE([gl_CLOCK_TIME]) AC_REQUIRE([gl_TIMESPEC]) - AC_CHECK_FUNCS_ONCE([gettimeofday nanotime]) + AC_CHECK_FUNCS_ONCE([gettimeofday]) ]) -- 2.17.1