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. --- bits/fenv.h | 4 ++-- bits/sched.h | 12 ++++++------ bits/sigset.h | 6 +++--- bits/sigthread.h | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'bits') diff --git a/bits/fenv.h b/bits/fenv.h index a9cb53b..61f31ab 100644 --- a/bits/fenv.h +++ b/bits/fenv.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1997-2001, 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 @@ -53,4 +53,4 @@ typedef struct fenv_t; /* If the default argument is used we use this value. */ -#define FE_DFL_ENV ((__const fenv_t *) -1l) +#define FE_DFL_ENV ((const fenv_t *) -1l) diff --git a/bits/sched.h b/bits/sched.h index 6fb5ab2..14f94bd 100644 --- a/bits/sched.h +++ b/bits/sched.h @@ -1,6 +1,6 @@ /* Definitions of constants and data structure for POSIX 1003.1b-1993 scheduling interface. - Copyright (C) 1996-1999,2001-2003,2005,2006,2007,2008,2009,2011 + Copyright (C) 1996-1999,2001-2003,2005,2006,2007,2008,2009,2011,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -102,7 +102,7 @@ typedef struct (__extension__ \ ({ size_t __cpu = (cpu); \ __cpu < 8 * (setsize) \ - ? ((((__const __cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)] \ + ? ((((const __cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)] \ & __CPUMASK (__cpu))) != 0 \ : 0; })) @@ -115,8 +115,8 @@ typedef struct # else # define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \ (__extension__ \ - ({ __const __cpu_mask *__arr1 = (cpusetp1)->__bits; \ - __const __cpu_mask *__arr2 = (cpusetp2)->__bits; \ + ({ const __cpu_mask *__arr1 = (cpusetp1)->__bits; \ + const __cpu_mask *__arr2 = (cpusetp2)->__bits; \ size_t __imax = (setsize) / sizeof (__cpu_mask); \ size_t __i; \ for (__i = 0; __i < __imax; ++__i) \ @@ -128,8 +128,8 @@ typedef struct # define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \ (__extension__ \ ({ cpu_set_t *__dest = (destset); \ - __const __cpu_mask *__arr1 = (srcset1)->__bits; \ - __const __cpu_mask *__arr2 = (srcset2)->__bits; \ + const __cpu_mask *__arr1 = (srcset1)->__bits; \ + const __cpu_mask *__arr2 = (srcset2)->__bits; \ size_t __imax = (setsize) / sizeof (__cpu_mask); \ size_t __i; \ for (__i = 0; __i < __imax; ++__i) \ diff --git a/bits/sigset.h b/bits/sigset.h index d6f9311..1d90a99 100644 --- a/bits/sigset.h +++ b/bits/sigset.h @@ -1,5 +1,5 @@ /* __sig_atomic_t, __sigset_t, and related definitions. Generic/BSD version. - Copyright (C) 1991, 1992, 1994, 1996, 1997, 2007 + Copyright (C) 1991, 1992, 1994, 1996, 1997, 2007, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -60,7 +60,7 @@ typedef unsigned long int __sigset_t; /* These functions needn't check for a bogus signal number -- error checking is done in the non __ versions. */ -extern int __sigismember (__const __sigset_t *, int); +extern int __sigismember (const __sigset_t *, int); extern int __sigaddset (__sigset_t *, int); extern int __sigdelset (__sigset_t *, int); @@ -73,7 +73,7 @@ extern int __sigdelset (__sigset_t *, int); return BODY; \ } -__SIGSETFN (__sigismember, (*__set & __mask) ? 1 : 0, __const) +__SIGSETFN (__sigismember, (*__set & __mask) ? 1 : 0, const) __SIGSETFN (__sigaddset, ((*__set |= __mask), 0), ) __SIGSETFN (__sigdelset, ((*__set &= ~__mask), 0), ) diff --git a/bits/sigthread.h b/bits/sigthread.h index 2edb58c..2756cc0 100644 --- a/bits/sigthread.h +++ b/bits/sigthread.h @@ -1,5 +1,5 @@ /* Signal handling function for threaded programs. Generic version. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 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 @@ -28,7 +28,7 @@ same meaning as for sigprocmask; in fact, this and sigprocmask might be the same function. We declare this the same on all platforms, since it doesn't use any thread-related types. */ -extern int pthread_sigmask (int __how, __const __sigset_t *__newmask, +extern int pthread_sigmask (int __how, const __sigset_t *__newmask, __sigset_t *__oldmask) __THROW; -- cgit v1.1