aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-25 09:33:04 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-25 09:33:04 +0000
commit7287c36dd8896ba1ddf72b0e5dc4b7baebee1b60 (patch)
tree9f25c731907fd0e482968d4ed9f93b9283c2ae4f /sysdeps/unix
parent49833554e36f76cb29991d1ca8bca5ae3669ce20 (diff)
downloadglibc-7287c36dd8896ba1ddf72b0e5dc4b7baebee1b60.tar
glibc-7287c36dd8896ba1ddf72b0e5dc4b7baebee1b60.tar.gz
glibc-7287c36dd8896ba1ddf72b0e5dc4b7baebee1b60.tar.bz2
glibc-7287c36dd8896ba1ddf72b0e5dc4b7baebee1b60.zip
Update.
* conform/conformtest.pl: Run Unix tests for XPG6. Implement handling of known namespace violations. Improve printing of results. * posix/unistd.h (usleep): Correct return type. * sysdeps/unix/sysv/linux/usleep.c: Correct return type. * sysdeps/unix/bsd/usleep.c: Correct return type. * sysdeps/mach/usleep.c: Correct return type. * sysdeps/generic/usleep.c: Correct return type. * posix/unistd.h (sync): Correct return type. * sysdeps/generic/sync.c: Likewise. * sysdeps/mach/hurd/sync.c: Likewise. * sysdeps/generic/bits/confname.h (_SC_IOV_MAX): New definition.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/bsd/usleep.c6
-rw-r--r--sysdeps/unix/sysv/linux/usleep.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sysdeps/unix/bsd/usleep.c b/sysdeps/unix/bsd/usleep.c
index ccd294f000..04bc24c28c 100644
--- a/sysdeps/unix/bsd/usleep.c
+++ b/sysdeps/unix/bsd/usleep.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1996, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1996, 1999, 2001 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
@@ -21,7 +21,7 @@
#include <sys/time.h>
/* Sleep USECONDS microseconds, or until a previously set timer goes off. */
-void
+int
usleep (useconds)
useconds_t useconds;
{
@@ -30,6 +30,6 @@ usleep (useconds)
delay.tv_sec = 0;
delay.tv_usec = useconds;
- (void) __select (0, (fd_set *) NULL, (fd_set *) NULL, (fd_set *) NULL,
+ return __select (0, (fd_set *) NULL, (fd_set *) NULL, (fd_set *) NULL,
&delay);
}
diff --git a/sysdeps/unix/sysv/linux/usleep.c b/sysdeps/unix/sysv/linux/usleep.c
index 2f94a6cbcc..f36e21c08f 100644
--- a/sysdeps/unix/sysv/linux/usleep.c
+++ b/sysdeps/unix/sysv/linux/usleep.c
@@ -1,5 +1,5 @@
/* Implementation of the BSD usleep function using nanosleep.
- Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1999, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -21,11 +21,11 @@
#include <time.h>
#include <unistd.h>
-void
+int
usleep (useconds_t useconds)
{
struct timespec ts = { tv_sec: (long int) (useconds / 1000000),
tv_nsec: (long int) (useconds % 1000000) * 1000ul };
- __nanosleep (&ts, NULL);
+ return __nanosleep (&ts, NULL);
}