From d6765f1da60acf05871ce09164416eaba58d324f Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 11 Aug 1998 21:52:02 +0000 Subject: 1998-08-12 Roland McGrath * sysdeps/mach/usleep.c: Include . (usleep): Return void. 1998-08-11 Roland McGrath * sysdeps/generic/if_index.c (struct if_freenameindex): Add forward decl to inhibit warning in if_freenameindex defn. * sysdeps/mach/hurd/ttyname_r.c (__ttyname_r): Remove unused variable. * sysdeps/mach/hurd/getdomain.c (getdomainname): Renamed from __ name. * sysdeps/mach/hurd/reboot.c: Include . * sysdeps/mach/hurd/getdents.c: Include . * sysdeps/mach/hurd/sbrk.c: Include . * sysdeps/mach/usleep.c: Likewise. * sysdeps/mach/hurd/bind.c (bind): Add a const. * sysdeps/mach/hurd/getdents.c (__getdirentries): Use prototype defn. * sysdeps/unix/bsd/init-posix.c (__init_posix): Likewise. * sysdeps/unix/bsd/times.c (timeval_to_clock_t): Likewise. * sysdeps/mach/hurd/reboot.c (reboot): Likewise. * sysdeps/mach/usleep.c (usleep): Likewise. * sysdeps/mach/hurd/chflags.c (chflags): Likewise. * sysdeps/mach/hurd/fchflags.c (fchflags): Likewise. * sysdeps/mach/hurd/sbrk.c (__sbrk): Likewise. * sysdeps/mach/hurd/stdio_init.c (__stdio_init_stream): Likewise. 1998-08-11 Roland McGrath * sysdeps/generic/glob64.c: Include , , . (glob64): Fix typo. * malloc/malloc.c (free_check, realloc_check): Don't cast to long for %p arg to fprintf, since `void *' is the right type already. --- sysdeps/mach/usleep.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'sysdeps/mach/usleep.c') diff --git a/sysdeps/mach/usleep.c b/sysdeps/mach/usleep.c index 5efed209fe..b687784552 100644 --- a/sysdeps/mach/usleep.c +++ b/sysdeps/mach/usleep.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1993, 1994, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1992, 93, 94, 97, 98 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 @@ -19,11 +19,11 @@ #include #include #include +#include /* Sleep USECONDS microseconds, or until a previously set timer goes off. */ -unsigned int -usleep (useconds) - unsigned int useconds; +void +usleep (unsigned int useconds) { mach_port_t recv; struct timeval before, after; @@ -31,13 +31,10 @@ usleep (useconds) recv = __mach_reply_port (); if (__gettimeofday (&before, NULL) < 0) - return useconds; + return; (void) __mach_msg (NULL, MACH_RCV_MSG|MACH_RCV_TIMEOUT|MACH_RCV_INTERRUPT, 0, 0, recv, (useconds + 999) / 1000, MACH_PORT_NULL); __mach_port_destroy (mach_task_self (), recv); if (__gettimeofday (&after, NULL) < 0) - return 0; - - return useconds - (((after.tv_sec - before.tv_sec) * 1000000) + - (after.tv_usec - before.tv_usec)); + return; } -- cgit v1.2.3