summaryrefslogtreecommitdiff
path: root/lib/gettime.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-10-08 18:21:47 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2018-10-08 18:22:22 -0700
commitcf1ebfa055fcd0749aa4ed2fc4c399470b9eb3de (patch)
tree8af8b5c52560c91b2094dae951b082c370496aea /lib/gettime.c
parentfc6004e61760d3bd3e27b593c318e634a221652c (diff)
downloademacs-cf1ebfa055fcd0749aa4ed2fc4c399470b9eb3de.tar.gz
Update from Gnulib
This incorporates: 2018-10-05 explicit_bzero: make it possible to namespace 2018-10-04 fcntl: make it possible to namespace 2018-10-01 mkostemp, mkostemps: fix C++ compilation on Mac OS X 2018-09-19 maint: mktime.c now shared with glibc 2018-09-18 file-has-acl: fix test failure on Cygwin 2.9 2018-09-18 gettime: nanotime never existed * admin/merge-gnulib (AVOIDED_MODULES): Add mkdir. * doc/misc/texinfo.tex, lib/acl-internal.c, lib/acl-internal.h: * lib/acl_entries.c, lib/explicit_bzero.c, lib/fcntl.c: * lib/get-permissions.c, lib/gettime.c, lib/mktime.c: * lib/set-permissions.c, lib/stdlib.in.h, m4/acl.m4, m4/gettime.m4: Copy from Gnulib. * lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'lib/gettime.c')
-rw-r--r--lib/gettime.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/gettime.c b/lib/gettime.c
index 171f22476f8..bb59c44ff0e 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);