From a784e502472fb3a1afa4d01a47c66b52d23e00f6 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 7 Jan 2012 23:57:22 -0500 Subject: Remove pre-ISO C support No more __const. --- include/sys/socket.h | 16 ++++++++-------- include/sys/stat.h | 14 +++++++------- include/sys/statfs.h | 4 ++-- include/sys/statvfs.h | 2 +- include/sys/syslog.h | 2 +- include/sys/time.h | 12 ++++++------ include/sys/uio.h | 8 ++++---- 7 files changed, 29 insertions(+), 29 deletions(-) (limited to 'include/sys') diff --git a/include/sys/socket.h b/include/sys/socket.h index df892783a0..d45c99d1cf 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -26,9 +26,9 @@ extern int __getpeername (int __fd, __SOCKADDR_ARG __addr, socklen_t *__len) attribute_hidden; /* Send N bytes of BUF to socket FD. Returns the number sent or -1. */ -extern ssize_t __libc_send (int __fd, __const void *__buf, size_t __n, +extern ssize_t __libc_send (int __fd, const void *__buf, size_t __n, int __flags); -extern ssize_t __send (int __fd, __const void *__buf, size_t __n, int __flags); +extern ssize_t __send (int __fd, const void *__buf, size_t __n, int __flags); libc_hidden_proto (__send) /* Read N bytes into BUF from socket FD. @@ -37,7 +37,7 @@ extern ssize_t __libc_recv (int __fd, void *__buf, size_t __n, int __flags); /* Send N bytes of BUF on socket FD to peer at address ADDR (which is ADDR_LEN bytes long). Returns the number sent, or -1 for errors. */ -extern ssize_t __libc_sendto (int __fd, __const void *__buf, size_t __n, +extern ssize_t __libc_sendto (int __fd, const void *__buf, size_t __n, int __flags, __CONST_SOCKADDR_ARG __addr, socklen_t __addr_len); @@ -69,10 +69,10 @@ extern ssize_t __recv (int __fd, void *__buf, size_t __n, int __flags) /* Send N bytes of BUF on socket FD to peer at address ADDR (which is ADDR_LEN bytes long). Returns the number sent, or -1 for errors. */ -extern ssize_t __libc_sendto (int __fd, __const void *__buf, size_t __n, +extern ssize_t __libc_sendto (int __fd, const void *__buf, size_t __n, int __flags, __CONST_SOCKADDR_ARG __addr, socklen_t __addr_len); -extern ssize_t __sendto (int __fd, __const void *__buf, size_t __n, +extern ssize_t __sendto (int __fd, const void *__buf, size_t __n, int __flags, __CONST_SOCKADDR_ARG __addr, socklen_t __addr_len) attribute_hidden; @@ -86,9 +86,9 @@ extern ssize_t __recvfrom (int __fd, void *__restrict __buf, size_t __n, /* Send a message described MESSAGE on socket FD. Returns the number of bytes sent, or -1 for errors. */ -extern ssize_t __libc_sendmsg (int __fd, __const struct msghdr *__message, +extern ssize_t __libc_sendmsg (int __fd, const struct msghdr *__message, int __flags); -extern ssize_t __sendmsg (int __fd, __const struct msghdr *__message, +extern ssize_t __sendmsg (int __fd, const struct msghdr *__message, int __flags) attribute_hidden; /* Receive a message as described by MESSAGE from socket FD. @@ -102,7 +102,7 @@ extern ssize_t __recvmsg (int __fd, struct msghdr *__message, to *OPTVAL (which is OPTLEN bytes long). Returns 0 on success, -1 for errors. */ extern int __setsockopt (int __fd, int __level, int __optname, - __const void *__optval, + const void *__optval, socklen_t __optlen) attribute_hidden; /* Put the current value for socket FD's option OPTNAME at protocol level LEVEL diff --git a/include/sys/stat.h b/include/sys/stat.h index cca0500ec2..a6cf60f401 100644 --- a/include/sys/stat.h +++ b/include/sys/stat.h @@ -2,14 +2,14 @@ #include /* Now define the internal interfaces. */ -extern int __stat (__const char *__file, struct stat *__buf); +extern int __stat (const char *__file, struct stat *__buf); extern int __fstat (int __fd, struct stat *__buf); -extern int __lstat (__const char *__file, struct stat *__buf); -extern int __chmod (__const char *__file, __mode_t __mode); +extern int __lstat (const char *__file, struct stat *__buf); +extern int __chmod (const char *__file, __mode_t __mode); extern int __fchmod (int __fd, __mode_t __mode); extern __mode_t __umask (__mode_t __mask); -extern int __mkdir (__const char *__path, __mode_t __mode); -extern int __mknod (__const char *__path, +extern int __mkdir (const char *__path, __mode_t __mode); +extern int __mknod (const char *__path, __mode_t __mode, __dev_t __dev); #if !defined NOT_IN_libc || defined IS_IN_rtld hidden_proto (__fxstat) @@ -19,12 +19,12 @@ hidden_proto (__lxstat64) hidden_proto (__xstat) hidden_proto (__xstat64) #endif -extern __inline__ int __stat (__const char *__path, struct stat *__statbuf) +extern __inline__ int __stat (const char *__path, struct stat *__statbuf) { return __xstat (_STAT_VER, __path, __statbuf); } libc_hidden_proto (__xmknod) -extern __inline__ int __mknod (__const char *__path, __mode_t __mode, +extern __inline__ int __mknod (const char *__path, __mode_t __mode, __dev_t __dev) { return __xmknod (_MKNOD_VER, __path, __mode, &__dev); diff --git a/include/sys/statfs.h b/include/sys/statfs.h index 80786a71f8..e34ad02965 100644 --- a/include/sys/statfs.h +++ b/include/sys/statfs.h @@ -2,9 +2,9 @@ #include /* Now define the internal interfaces. */ -extern int __statfs (__const char *__file, struct statfs *__buf); +extern int __statfs (const char *__file, struct statfs *__buf); libc_hidden_proto (__statfs) extern int __fstatfs (int __fildes, struct statfs *__buf); -extern int __statfs64 (__const char *__file, struct statfs64 *__buf); +extern int __statfs64 (const char *__file, struct statfs64 *__buf); extern int __fstatfs64 (int __fildes, struct statfs64 *__buf); #endif diff --git a/include/sys/statvfs.h b/include/sys/statvfs.h index b3c6a35c64..74ef2db45d 100644 --- a/include/sys/statvfs.h +++ b/include/sys/statvfs.h @@ -2,7 +2,7 @@ #include /* Now define the internal interfaces. */ -extern int __statvfs64 (__const char *__file, struct statvfs64 *__buf); +extern int __statvfs64 (const char *__file, struct statvfs64 *__buf); extern int __fstatvfs64 (int __fildes, struct statvfs64 *__buf); libc_hidden_proto (statvfs) diff --git a/include/sys/syslog.h b/include/sys/syslog.h index 8b0d59dad6..c08cfcd1fa 100644 --- a/include/sys/syslog.h +++ b/include/sys/syslog.h @@ -3,7 +3,7 @@ libc_hidden_proto (syslog) libc_hidden_proto (vsyslog) -extern void __vsyslog_chk (int __pri, int __flag, __const char *__fmt, +extern void __vsyslog_chk (int __pri, int __flag, const char *__fmt, __gnuc_va_list __ap) __attribute__ ((__format__ (__printf__, 3, 0))); libc_hidden_proto (__vsyslog_chk) diff --git a/include/sys/time.h b/include/sys/time.h index ec4055276e..a5ec500cde 100644 --- a/include/sys/time.h +++ b/include/sys/time.h @@ -7,20 +7,20 @@ extern int __gettimeofday (struct timeval *__tv, extern int __gettimeofday_internal (struct timeval *__tv, struct timezone *__tz) attribute_hidden; -extern int __settimeofday (__const struct timeval *__tv, - __const struct timezone *__tz) +extern int __settimeofday (const struct timeval *__tv, + const struct timezone *__tz) attribute_hidden; -extern int __adjtime (__const struct timeval *__delta, +extern int __adjtime (const struct timeval *__delta, struct timeval *__olddelta); extern int __getitimer (enum __itimer_which __which, struct itimerval *__value); extern int __setitimer (enum __itimer_which __which, - __const struct itimerval *__restrict __new, + const struct itimerval *__restrict __new, struct itimerval *__restrict __old) attribute_hidden; -extern int __utimes (__const char *__file, const struct timeval __tvp[2]) +extern int __utimes (const char *__file, const struct timeval __tvp[2]) attribute_hidden; -extern int __futimes (int fd, __const struct timeval tvp[2]) attribute_hidden; +extern int __futimes (int fd, const struct timeval tvp[2]) attribute_hidden; #ifndef NOT_IN_libc # define __gettimeofday(tv, tz) INTUSE(__gettimeofday) (tv, tz) diff --git a/include/sys/uio.h b/include/sys/uio.h index 8c2b0167c1..1e5d64e47e 100644 --- a/include/sys/uio.h +++ b/include/sys/uio.h @@ -2,12 +2,12 @@ #include /* Now define the internal interfaces. */ -extern ssize_t __readv (int __fd, __const struct iovec *__vector, +extern ssize_t __readv (int __fd, const struct iovec *__vector, int __count); -extern ssize_t __libc_readv (int __fd, __const struct iovec *__vector, +extern ssize_t __libc_readv (int __fd, const struct iovec *__vector, int __count); -extern ssize_t __writev (int __fd, __const struct iovec *__vector, +extern ssize_t __writev (int __fd, const struct iovec *__vector, int __count); -extern ssize_t __libc_writev (int __fd, __const struct iovec *__vector, +extern ssize_t __libc_writev (int __fd, const struct iovec *__vector, int __count); #endif -- cgit 1.4.1