diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/bits/confname.h | 4 | ||||
| -rw-r--r-- | sysdeps/generic/sync.c | 5 | ||||
| -rw-r--r-- | sysdeps/generic/usleep.c | 7 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/sync.c | 7 | ||||
| -rw-r--r-- | sysdeps/mach/usleep.c | 10 | ||||
| -rw-r--r-- | sysdeps/unix/bsd/usleep.c | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/usleep.c | 6 |
7 files changed, 25 insertions, 20 deletions
diff --git a/sysdeps/generic/bits/confname.h b/sysdeps/generic/bits/confname.h index 80a2eda0af..a783fc0cd8 100644 --- a/sysdeps/generic/bits/confname.h +++ b/sysdeps/generic/bits/confname.h @@ -1,5 +1,5 @@ /* `sysconf', `pathconf', and `confstr' NAME values. Generic version. - Copyright (C) 1993, 1995-1998, 2000 Free Software Foundation, Inc. + Copyright (C) 1993, 1995-1998, 2000, 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 @@ -185,6 +185,8 @@ enum #define _SC_SELECT _SC_SELECT _SC_UIO_MAXIOV, #define _SC_UIO_MAXIOV _SC_UIO_MAXIOV + _SC_IOV_MAX = _SC_UIO_MAXIOV, +#define _SC_IOV_MAX _SC_IOV_MAX _SC_PII_INTERNET_STREAM, #define _SC_PII_INTERNET_STREAM _SC_PII_INTERNET_STREAM _SC_PII_INTERNET_DGRAM, diff --git a/sysdeps/generic/sync.c b/sysdeps/generic/sync.c index aa04edf524..1619d1c930 100644 --- a/sysdeps/generic/sync.c +++ b/sysdeps/generic/sync.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 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 @@ -20,11 +20,10 @@ #include <unistd.h> /* Make all changes done to all files actually appear on disk. */ -int +void sync () { __set_errno (ENOSYS); - return -1; } diff --git a/sysdeps/generic/usleep.c b/sysdeps/generic/usleep.c index cd2355c868..aefb92dd58 100644 --- a/sysdeps/generic/usleep.c +++ b/sysdeps/generic/usleep.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1991,1995,1996,1997,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 @@ -16,13 +16,16 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <errno.h> #include <unistd.h> /* Sleep USECONDS microseconds, or until a previously set timer goes off. */ -void +int usleep (useconds) useconds_t useconds; { + __set_errno (ENOSYS); + return -1; } stub_warning (usleep) diff --git a/sysdeps/mach/hurd/sync.c b/sysdeps/mach/hurd/sync.c index 4f61274f7f..5c6d7c460a 100644 --- a/sysdeps/mach/hurd/sync.c +++ b/sysdeps/mach/hurd/sync.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991,1992,1993,1994,1997,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,12 +21,11 @@ #include <hurd.h> /* Make all changes done to all files actually appear on disk. */ -int +void sync () { /* This is not actually synchronous; we don't wait. */ error_t err = __USEPORT (CRDIR, __file_syncfs (port, 0, 1)); if (err) - return __hurd_fail (err); - return 0; + (void) __hurd_fail (err); } diff --git a/sysdeps/mach/usleep.c b/sysdeps/mach/usleep.c index d09ab12ab2..8ea962c723 100644 --- a/sysdeps/mach/usleep.c +++ b/sysdeps/mach/usleep.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 93, 94, 97, 98, 99 Free Software Foundation, Inc. +/* Copyright (C) 1992, 93, 94, 97, 98, 99, 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 @@ -22,7 +22,7 @@ #include <unistd.h> /* Sleep USECONDS microseconds, or until a previously set timer goes off. */ -void +int usleep (useconds_t useconds) { mach_port_t recv; @@ -31,10 +31,12 @@ usleep (useconds_t useconds) recv = __mach_reply_port (); if (__gettimeofday (&before, NULL) < 0) - return; + return -1; (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; + return -1; + + return 0; } 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); } |