public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] Hurd: Fix ftime build
@ 2020-10-27 19:29 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2020-10-27 19:29 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=641a12484562b3a740b940620ac2c47a626c9861
commit 641a12484562b3a740b940620ac2c47a626c9861
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Tue Oct 27 15:21:50 2020 -0300
Hurd: Fix ftime build
It does not provide __clock_gettime64, the ftime y2038 support is
moved to a Linux specific implementation.
Checked with a build for i686-linux-gnu and on x86_64-linux and
i686-linux-gnu.
Diff:
---
sysdeps/unix/sysv/linux/ftime.c | 54 +++++++++++++++++++++++++++++++++++++++++
time/ftime.c | 29 +++-------------------
2 files changed, 58 insertions(+), 25 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/ftime.c b/sysdeps/unix/sysv/linux/ftime.c
new file mode 100644
index 0000000000..1755fcf967
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/ftime.c
@@ -0,0 +1,54 @@
+/* Deprecated return date and time. Linux version.
+ Copyright (C) 1994-2020 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <features.h>
+#include <sys/timeb.h>
+#include <errno.h>
+
+int
+__ftime64 (struct __timeb64 *timebuf)
+{
+ struct __timespec64 ts;
+ __clock_gettime64 (CLOCK_REALTIME, &ts);
+
+ timebuf->time = ts.tv_sec;
+ timebuf->millitm = ts.tv_nsec / 1000000;
+ timebuf->timezone = 0;
+ timebuf->dstflag = 0;
+ return 0;
+}
+#if __TIMESIZE != 64
+libc_hidden_def (__ftime64)
+
+int
+ftime (struct timeb *timebuf)
+{
+ struct __timeb64 tb64;
+ __ftime64 (&tb64);
+ if (! in_time_t_range (tb64.time))
+ {
+ __set_errno (EOVERFLOW);
+ return -1;
+ }
+ timebuf->time = tb64.time;
+ timebuf->millitm = tb64.millitm;
+ timebuf->timezone = tb64.timezone;
+ timebuf->dstflag = tb64.dstflag;
+ return 0;
+}
+#endif
diff --git a/time/ftime.c b/time/ftime.c
index 91ba100503..93f485bbf7 100644
--- a/time/ftime.c
+++ b/time/ftime.c
@@ -16,15 +16,14 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <features.h>
#include <sys/timeb.h>
-#include <errno.h>
+#include <time.h>
int
-__ftime64 (struct __timeb64 *timebuf)
+ftime (struct timeb *timebuf)
{
- struct __timespec64 ts;
- __clock_gettime64 (CLOCK_REALTIME, &ts);
+ struct timespec ts;
+ __clock_gettime (CLOCK_REALTIME, &ts);
timebuf->time = ts.tv_sec;
timebuf->millitm = ts.tv_nsec / 1000000;
@@ -32,23 +31,3 @@ __ftime64 (struct __timeb64 *timebuf)
timebuf->dstflag = 0;
return 0;
}
-#if __TIMESIZE != 64
-libc_hidden_def (__ftime64)
-
-int
-ftime (struct timeb *timebuf)
-{
- struct __timeb64 tb64;
- __ftime64 (&tb64);
- if (! in_time_t_range (tb64.time))
- {
- __set_errno (EOVERFLOW);
- return -1;
- }
- timebuf->time = tb64.time;
- timebuf->millitm = tb64.millitm;
- timebuf->timezone = tb64.timezone;
- timebuf->dstflag = tb64.dstflag;
- return 0;
-}
-#endif
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-10-27 19:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-27 19:29 [glibc] Hurd: Fix ftime build Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).