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. --- rt/aio.h | 28 ++++++++++++++-------------- rt/bits/mqueue2.h | 10 +++++----- rt/mqueue.h | 18 +++++++++--------- 3 files changed, 28 insertions(+), 28 deletions(-) (limited to 'rt') diff --git a/rt/aio.h b/rt/aio.h index 7cfd0c1106..644bbe93dd 100644 --- a/rt/aio.h +++ b/rt/aio.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2000,2003,2004,2007 Free Software Foundation, Inc. +/* Copyright (C) 1996-2000,2003,2004,2007,2012 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 @@ -136,7 +136,7 @@ enum /* Allow user to specify optimization. */ #ifdef __USE_GNU -extern void aio_init (__const struct aioinit *__init) __THROW __nonnull ((1)); +extern void aio_init (const struct aioinit *__init) __THROW __nonnull ((1)); #endif @@ -148,12 +148,12 @@ extern int aio_write (struct aiocb *__aiocbp) __THROW __nonnull ((1)); /* Initiate list of I/O requests. */ extern int lio_listio (int __mode, - struct aiocb *__const __list[__restrict_arr], + struct aiocb *const __list[__restrict_arr], int __nent, struct sigevent *__restrict __sig) __THROW __nonnull ((2)); /* Retrieve error status associated with AIOCBP. */ -extern int aio_error (__const struct aiocb *__aiocbp) __THROW __nonnull ((1)); +extern int aio_error (const struct aiocb *__aiocbp) __THROW __nonnull ((1)); /* Return status associated with AIOCBP. */ extern __ssize_t aio_return (struct aiocb *__aiocbp) __THROW __nonnull ((1)); @@ -166,8 +166,8 @@ extern int aio_cancel (int __fildes, struct aiocb *__aiocbp) __THROW; This function is a cancellation point and therefore not marked with __THROW. */ -extern int aio_suspend (__const struct aiocb *__const __list[], int __nent, - __const struct timespec *__restrict __timeout) +extern int aio_suspend (const struct aiocb *const __list[], int __nent, + const struct timespec *__restrict __timeout) __nonnull ((1)); /* Force all operations associated with file desriptor described by @@ -183,11 +183,11 @@ extern int __REDIRECT_NTH (aio_write, (struct aiocb *__aiocbp), aio_write64) extern int __REDIRECT_NTH (lio_listio, (int __mode, - struct aiocb *__const __list[__restrict_arr], + struct aiocb *const __list[__restrict_arr], int __nent, struct sigevent *__restrict __sig), lio_listio64) __nonnull ((2)); -extern int __REDIRECT_NTH (aio_error, (__const struct aiocb *__aiocbp), +extern int __REDIRECT_NTH (aio_error, (const struct aiocb *__aiocbp), aio_error64) __nonnull ((1)); extern __ssize_t __REDIRECT_NTH (aio_return, (struct aiocb *__aiocbp), aio_return64) __nonnull ((1)); @@ -197,8 +197,8 @@ extern int __REDIRECT_NTH (aio_cancel, aio_cancel64); extern int __REDIRECT_NTH (aio_suspend, - (__const struct aiocb *__const __list[], int __nent, - __const struct timespec *__restrict __timeout), + (const struct aiocb *const __list[], int __nent, + const struct timespec *__restrict __timeout), aio_suspend64) __nonnull ((1)); extern int __REDIRECT_NTH (aio_fsync, @@ -222,19 +222,19 @@ extern int aio_read64 (struct aiocb64 *__aiocbp) __THROW __nonnull ((1)); extern int aio_write64 (struct aiocb64 *__aiocbp) __THROW __nonnull ((1)); extern int lio_listio64 (int __mode, - struct aiocb64 *__const __list[__restrict_arr], + struct aiocb64 *const __list[__restrict_arr], int __nent, struct sigevent *__restrict __sig) __THROW __nonnull ((2)); -extern int aio_error64 (__const struct aiocb64 *__aiocbp) +extern int aio_error64 (const struct aiocb64 *__aiocbp) __THROW __nonnull ((1)); extern __ssize_t aio_return64 (struct aiocb64 *__aiocbp) __THROW __nonnull ((1)); extern int aio_cancel64 (int __fildes, struct aiocb64 *__aiocbp) __THROW; -extern int aio_suspend64 (__const struct aiocb64 *__const __list[], int __nent, - __const struct timespec *__restrict __timeout) +extern int aio_suspend64 (const struct aiocb64 *const __list[], int __nent, + const struct timespec *__restrict __timeout) __THROW __nonnull ((1)); extern int aio_fsync64 (int __operation, struct aiocb64 *__aiocbp) diff --git a/rt/bits/mqueue2.h b/rt/bits/mqueue2.h index a6d0815722..aa9f126aa6 100644 --- a/rt/bits/mqueue2.h +++ b/rt/bits/mqueue2.h @@ -1,5 +1,5 @@ /* Checking macros for mq functions. - Copyright (C) 2007, 2011 Free Software Foundation, Inc. + Copyright (C) 2007, 2011, 2012 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 @@ -23,11 +23,11 @@ /* Check that calls to mq_open with O_CREAT set have an appropriate third and fourth parameter. */ -extern mqd_t mq_open (__const char *__name, int __oflag, ...) +extern mqd_t mq_open (const char *__name, int __oflag, ...) __THROW __nonnull ((1)); -extern mqd_t __mq_open_2 (__const char *__name, int __oflag) +extern mqd_t __mq_open_2 (const char *__name, int __oflag) __THROW __nonnull ((1)); -extern mqd_t __REDIRECT_NTH (__mq_open_alias, (__const char *__name, +extern mqd_t __REDIRECT_NTH (__mq_open_alias, (const char *__name, int __oflag, ...), mq_open) __nonnull ((1)); __errordecl (__mq_open_wrong_number_of_args, @@ -36,7 +36,7 @@ __errordecl (__mq_open_missing_mode_and_attr, "mq_open with O_CREAT in second argument needs 4 arguments"); __extern_always_inline mqd_t -__NTH (mq_open (__const char *__name, int __oflag, ...)) +__NTH (mq_open (const char *__name, int __oflag, ...)) { if (__va_arg_pack_len () != 0 && __va_arg_pack_len () != 2) __mq_open_wrong_number_of_args (); diff --git a/rt/mqueue.h b/rt/mqueue.h index a4c3e1b2fa..ffdf140115 100644 --- a/rt/mqueue.h +++ b/rt/mqueue.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2004, 2005, 2007, 2012 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 @@ -38,7 +38,7 @@ __BEGIN_DECLS argument is taken as `struct mq_attr *', pointer to message queue attributes. If the fourth argument is NULL, default attributes are used. */ -extern mqd_t mq_open (__const char *__name, int __oflag, ...) +extern mqd_t mq_open (const char *__name, int __oflag, ...) __THROW __nonnull ((1)); /* Removes the association between message queue descriptor MQDES and its @@ -52,16 +52,16 @@ extern int mq_getattr (mqd_t __mqdes, struct mq_attr *__mqstat) /* Set attributes associated with message queue MQDES and if OMQSTAT is not NULL also query its old attributes. */ extern int mq_setattr (mqd_t __mqdes, - __const struct mq_attr *__restrict __mqstat, + const struct mq_attr *__restrict __mqstat, struct mq_attr *__restrict __omqstat) __THROW __nonnull ((2)); /* Remove message queue named NAME. */ -extern int mq_unlink (__const char *__name) __THROW __nonnull ((1)); +extern int mq_unlink (const char *__name) __THROW __nonnull ((1)); /* Register notification issued upon message arrival to an empty message queue MQDES. */ -extern int mq_notify (mqd_t __mqdes, __const struct sigevent *__notification) +extern int mq_notify (mqd_t __mqdes, const struct sigevent *__notification) __THROW; /* Receive the oldest from highest priority messages in message queue @@ -70,7 +70,7 @@ extern ssize_t mq_receive (mqd_t __mqdes, char *__msg_ptr, size_t __msg_len, unsigned int *__msg_prio) __nonnull ((2)); /* Add message pointed by MSG_PTR to message queue MQDES. */ -extern int mq_send (mqd_t __mqdes, __const char *__msg_ptr, size_t __msg_len, +extern int mq_send (mqd_t __mqdes, const char *__msg_ptr, size_t __msg_len, unsigned int __msg_prio) __nonnull ((2)); #ifdef __USE_XOPEN2K @@ -79,14 +79,14 @@ extern int mq_send (mqd_t __mqdes, __const char *__msg_ptr, size_t __msg_len, extern ssize_t mq_timedreceive (mqd_t __mqdes, char *__restrict __msg_ptr, size_t __msg_len, unsigned int *__restrict __msg_prio, - __const struct timespec *__restrict __abs_timeout) + const struct timespec *__restrict __abs_timeout) __nonnull ((2, 5)); /* Add message pointed by MSG_PTR to message queue MQDES, stop blocking on full message queue if ABS_TIMEOUT expires. */ -extern int mq_timedsend (mqd_t __mqdes, __const char *__msg_ptr, +extern int mq_timedsend (mqd_t __mqdes, const char *__msg_ptr, size_t __msg_len, unsigned int __msg_prio, - __const struct timespec *__abs_timeout) + const struct timespec *__abs_timeout) __nonnull ((2, 5)); #endif -- cgit v1.2.3