diff options
Diffstat (limited to 'misc/sys')
-rw-r--r-- | misc/sys/cdefs.h | 24 | ||||
-rw-r--r-- | misc/sys/file.h | 4 | ||||
-rw-r--r-- | misc/sys/ioctl.h | 4 | ||||
-rw-r--r-- | misc/sys/mman.h | 36 | ||||
-rw-r--r-- | misc/sys/select.h | 21 | ||||
-rw-r--r-- | misc/sys/syslog.h | 14 | ||||
-rw-r--r-- | misc/sys/uio.h | 10 | ||||
-rw-r--r-- | misc/sys/ustat.h | 4 |
8 files changed, 55 insertions, 62 deletions
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index 6a8b870e13..84e24b0b62 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -43,8 +43,6 @@ functions. */ # define __PMT(args) args -# define __DOTS , ... - #else /* Not GCC. */ # define __inline /* No inline functions. */ @@ -53,22 +51,18 @@ # define __P(args) args # define __PMT(args) args -# define __const const -# define __signed signed -# define __volatile volatile -# define __DOTS , ... # else /* Not ANSI C or C++. */ # define __P(args) () /* No prototypes. */ # define __PMT(args) () -# define __const /* No ANSI C keywords. */ -# define __signed -# define __volatile -# define __DOTS # endif /* ANSI C or C++. */ +# define __const const +# define __signed signed +# define __volatile volatile + #endif /* GCC. */ /* For these things, GCC behaves the ANSI way normally, @@ -95,11 +89,11 @@ old programs may lose if they use the new keywords as identifiers), but those names are not available under -traditional. We define them to their __ versions, which are taken care of above. */ -#ifdef __USE_BSD -# define const __const -# define signed __signed -# define volatile __volatile -#endif +# ifdef __USE_BSD +# define const __const +# define signed __signed +# define volatile __volatile +# endif #endif /* __STDC__ */ diff --git a/misc/sys/file.h b/misc/sys/file.h index a2e7bf0ee6..faff35ddef 100644 --- a/misc/sys/file.h +++ b/misc/sys/file.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 96, 97, 98, 99 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 @@ -48,7 +48,7 @@ __BEGIN_DECLS /* Apply or remove an advisory lock, according to OPERATION, on the file FD refers to. */ -extern int flock __P ((int __fd, int __operation)); +extern int flock (int __fd, int __operation) __THROW; __END_DECLS diff --git a/misc/sys/ioctl.h b/misc/sys/ioctl.h index acb42f2b35..30a9155b58 100644 --- a/misc/sys/ioctl.h +++ b/misc/sys/ioctl.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 93, 94, 96, 98 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 94, 96, 98, 99 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 @@ -39,7 +39,7 @@ __BEGIN_DECLS /* Perform the I/O control operation specified by REQUEST on FD. One argument may follow; its presence and type depend on REQUEST. Return value depends on REQUEST. Usually -1 indicates error. */ -extern int ioctl __P ((int __fd, unsigned long int __request, ...)); +extern int ioctl (int __fd, unsigned long int __request, ...) __THROW; __END_DECLS diff --git a/misc/sys/mman.h b/misc/sys/mman.h index 92b4bf85a0..cddb451081 100644 --- a/misc/sys/mman.h +++ b/misc/sys/mman.h @@ -1,5 +1,5 @@ /* Definitions for BSD-style memory management. - Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1994, 95, 96, 97, 98, 99 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 @@ -28,7 +28,7 @@ #include <bits/mman.h> /* Return value of `mmap' in case of an error. */ -#define MAP_FAILED ((__ptr_t) -1) +#define MAP_FAILED ((void *) -1) __BEGIN_DECLS /* Map addresses starting near ADDR and extending for LEN bytes. from @@ -41,60 +41,60 @@ __BEGIN_DECLS deallocates any previous mapping for the affected region. */ #ifndef __USE_FILE_OFFSET64 -extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off_t __offset)); +extern void *mmap (void *__addr, size_t __len, int __prot, + int __flags, int __fd, __off_t __offset) __THROW; #else -extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off_t __offset)) +extern void *mmap (void *__addr, size_t __len, int __prot, + int __flags, int __fd, __off_t __offset) __THROW __asm__ ("mmap64"); #endif #ifdef __USE_LARGEFILE64 -extern __ptr_t mmap64 __P ((__ptr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off64_t __offset)); +extern void *mmap64 (void *__addr, size_t __len, int __prot, + int __flags, int __fd, __off64_t __offset) __THROW; #endif /* Deallocate any mapping for the region starting at ADDR and extending LEN bytes. Returns 0 if successful, -1 for errors (and sets errno). */ -extern int munmap __P ((__ptr_t __addr, size_t __len)); +extern int munmap (void *__addr, size_t __len) __THROW; /* Change the memory protection of the region starting at ADDR and extending LEN bytes to PROT. Returns 0 if successful, -1 for errors (and sets errno). */ -extern int mprotect __P ((__ptr_t __addr, size_t __len, int __prot)); +extern int mprotect (void *__addr, size_t __len, int __prot) __THROW; /* Synchronize the region starting at ADDR and extending LEN bytes with the file it maps. Filesystem operations on a file being mapped are unpredictable before this is done. Flags are from the MS_* set. */ -extern int msync __P ((__ptr_t __addr, size_t __len, int __flags)); +extern int msync (void *__addr, size_t __len, int __flags) __THROW; #ifdef __USE_BSD /* Advise the system about particular usage patterns the program follows for the region starting at ADDR and extending LEN bytes. */ -extern int madvise __P ((__ptr_t __addr, size_t __len, int __advice)); +extern int madvise (void *__addr, size_t __len, int __advice) __THROW; #endif /* Guarantee all whole pages mapped by the range [ADDR,ADDR+LEN) to be memory resident. */ -extern int mlock __P ((__const __ptr_t __addr, size_t __len)); +extern int mlock (__const void *__addr, size_t __len) __THROW; /* Unlock whole pages previously mapped by the range [ADDR,ADDR+LEN). */ -extern int munlock __P ((__const __ptr_t __addr, size_t __len)); +extern int munlock (__const void *__addr, size_t __len) __THROW; /* Cause all currently mapped pages of the process to be memory resident until unlocked by a call to the `munlockall', until the process exits, or until the process calls `execve'. */ -extern int mlockall __P ((int __flags)); +extern int mlockall (int __flags) __THROW; /* All currently mapped pages of the process' address space become unlocked. */ -extern int munlockall __P ((void)); +extern int munlockall (void) __THROW; #ifdef __USE_MISC /* Remap pages mapped by the range [ADDR,ADDR+OLD_LEN) to new length NEW_LEN. If MAY_MOVE is MREMAP_MAYMOVE the returned address may differ from ADDR. */ -extern __ptr_t mremap __P ((__ptr_t __addr, size_t __old_len, - size_t __new_len, int __may_move)); +extern void *mremap (void *__addr, size_t __old_len, size_t __new_len, + int __may_move) __THROW; #endif __END_DECLS diff --git a/misc/sys/select.h b/misc/sys/select.h index 0972560b97..15130cbab3 100644 --- a/misc/sys/select.h +++ b/misc/sys/select.h @@ -1,5 +1,5 @@ /* `fd_set' type and related macros, and `select'/`pselect' declarations. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999 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 @@ -71,12 +71,12 @@ typedef __fd_set fd_set; (if not NULL) for exceptional conditions. If TIMEOUT is not NULL, time out after waiting the interval specified therein. Returns the number of ready descriptors, or -1 for errors. */ -extern int __select __P ((int __nfds, __fd_set *__readfds, - __fd_set *__writefds, __fd_set *__exceptfds, - struct timeval *__timeout)); -extern int select __P ((int __nfds, __fd_set *__readfds, - __fd_set *__writefds, __fd_set *__exceptfds, - struct timeval *__timeout)); +extern int __select (int __nfds, __fd_set *__readfds, + __fd_set *__writefds, __fd_set *__exceptfds, + struct timeval *__timeout) __THROW; +extern int select (int __nfds, __fd_set *__readfds, + __fd_set *__writefds, __fd_set *__exceptfds, + struct timeval *__timeout) __THROW; #ifdef __USE_GNU /* XXX Once/if POSIX.1g gets official this prototype will be available @@ -84,10 +84,9 @@ extern int select __P ((int __nfds, __fd_set *__readfds, /* Same as above only that the TIMEOUT value is given with higher resolution and a sigmask which is been set temporarily. This version should be used. */ -extern int pselect __P ((int __nfds, __fd_set *__readfds, - __fd_set *__writefds, __fd_set *__exceptfds, - const struct timespec *__timeout, - const __sigset_t *__sigmask)); +extern int pselect (int __nfds, __fd_set *__readfds, __fd_set *__writefds, + __fd_set *__exceptfds, const struct timespec *__timeout, + const __sigset_t *__sigmask) __THROW; #endif __END_DECLS diff --git a/misc/sys/syslog.h b/misc/sys/syslog.h index 143f946bd4..a2b720909a 100644 --- a/misc/sys/syslog.h +++ b/misc/sys/syslog.h @@ -169,22 +169,22 @@ CODE facilitynames[] = __BEGIN_DECLS /* Close desriptor used to write to system logger. */ -extern void closelog __P ((void)); +extern void closelog (void) __THROW; /* Open connection to system logger. */ -extern void openlog __P ((__const char *__ident, int __option, - int __facility)); +extern void openlog (__const char *__ident, int __option, int __facility) + __THROW; /* Set the log mask level. */ -extern int setlogmask __P ((int __mask)); +extern int setlogmask (int __mask) __THROW; /* Generate a log message using FMT string and option arguments. */ -extern void syslog __P ((int __pri, __const char *__fmt, ...)); +extern void syslog (int __pri, __const char *__fmt, ...) __THROW; #ifdef __USE_BSD /* Generate a log message using FMT and using arguments pointed to by AP. */ -extern void vsyslog __P ((int __pri, __const char *__fmt, - __gnuc_va_list __ap)); +extern void vsyslog (int __pri, __const char *__fmt, __gnuc_va_list __ap) + __THROW; #endif __END_DECLS diff --git a/misc/sys/uio.h b/misc/sys/uio.h index 0be33e9b45..f833a52ec8 100644 --- a/misc/sys/uio.h +++ b/misc/sys/uio.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 96, 97, 98, 99 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 @@ -34,16 +34,16 @@ __BEGIN_DECLS The buffers are filled in the order specified. Operates just like `read' (see <unistd.h>) except that data are put in VECTOR instead of a contiguous buffer. */ -extern ssize_t readv __P ((int __fd, __const struct iovec *__vector, - int __count)); +extern ssize_t readv (int __fd, __const struct iovec *__vector, int __count) + __THROW; /* Write data pointed by the buffers described by VECTOR, which is a vector of COUNT `struct iovec's, to file descriptor FD. The data is written in the order specified. Operates just like `write' (see <unistd.h>) except that the data are taken from VECTOR instead of a contiguous buffer. */ -extern ssize_t writev __P ((int __fd, __const struct iovec *__vector, - int __count)); +extern ssize_t writev (int __fd, __const struct iovec *__vector, int __count) + __THROW; __END_DECLS diff --git a/misc/sys/ustat.h b/misc/sys/ustat.h index 355f28ddd9..58862ffb03 100644 --- a/misc/sys/ustat.h +++ b/misc/sys/ustat.h @@ -1,5 +1,5 @@ /* Header describing obsolete `ustat' interface. - Copyright (C) 1996, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1998, 1999 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 @@ -31,7 +31,7 @@ __BEGIN_DECLS -extern int ustat __P ((__dev_t __dev, struct ustat *__ubuf)); +extern int ustat (__dev_t __dev, struct ustat *__ubuf) __THROW; __END_DECLS |