summary refs log tree commit diff
path: root/time
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2020-10-27 15:21:50 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2020-10-27 16:20:45 -0300
commit641a12484562b3a740b940620ac2c47a626c9861 (patch)
tree62b09884d3084b83458b231052996505133ac4ae /time
parentb94cc191e0e7cb9894e32683f4f9cc32766b94e2 (diff)
downloadglibc-641a12484562b3a740b940620ac2c47a626c9861.tar.gz
glibc-641a12484562b3a740b940620ac2c47a626c9861.tar.xz
glibc-641a12484562b3a740b940620ac2c47a626c9861.zip
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.
Diffstat (limited to 'time')
-rw-r--r--time/ftime.c29
1 files changed, 4 insertions, 25 deletions
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