From: Mike Frysinger Date: Tue, 17 Apr 2012 02:21:32 +0000 (-0400) Subject: ia64: convert __const to const X-Git-Tag: glibc-2.16-ports-before-merge~163 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=293432b4af0862e35d74c1dc84cec496b6611daf;p=thirdparty%2Fglibc.git ia64: convert __const to const The main tree decided to drop support for pre-ISO C code, so we can use "const" instead of "__const". Processed with a simple sed script: find `find sysdeps/ -name ia64` -type f -exec sed -i \ 's:\<__const\>:const:' {} + Signed-off-by: Mike Frysinger --- diff --git a/ChangeLog.ia64 b/ChangeLog.ia64 index f48cbf90727..6bdca2cf0b9 100644 --- a/ChangeLog.ia64 +++ b/ChangeLog.ia64 @@ -1,3 +1,8 @@ +2012-04-27 Mike Frysinger + + * sysdeps/ia64/bits/fenv.h: Change __const to const. + * sysdeps/unix/sysv/linux/ia64/swapcontext.c: Likewise. + 2012-04-27 Mike Frysinger * sysdeps/ia64/fpu/s_matherrf.c: Change "math.h" and "math_private.h" diff --git a/sysdeps/ia64/bits/fenv.h b/sysdeps/ia64/bits/fenv.h index 0422a95d7e7..342605d8ceb 100644 --- a/sysdeps/ia64/bits/fenv.h +++ b/sysdeps/ia64/bits/fenv.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1999-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 @@ -72,15 +72,15 @@ typedef unsigned long int fexcept_t; typedef unsigned long int fenv_t; /* If the default argument is used we use this value. */ -#define FE_DFL_ENV ((__const fenv_t *) 0xc009804c0270033fUL) +#define FE_DFL_ENV ((const fenv_t *) 0xc009804c0270033fUL) #ifdef __USE_GNU /* Floating-point environment where only FE_UNNORMAL is masked since this exception is not generally supported by glibc. */ -# define FE_NOMASK_ENV ((__const fenv_t *) 0xc009804c02700302UL) +# define FE_NOMASK_ENV ((const fenv_t *) 0xc009804c02700302UL) /* Floating-point environment with (processor-dependent) non-IEEE floating point. In this case, turning on flush-to-zero mode for s0, s2, and s3. */ -# define FE_NONIEEE_ENV ((__const fenv_t *) 0xc009a04d0270037fUL) +# define FE_NONIEEE_ENV ((const fenv_t *) 0xc009a04d0270037fUL) #endif diff --git a/sysdeps/unix/sysv/linux/ia64/swapcontext.c b/sysdeps/unix/sysv/linux/ia64/swapcontext.c index 2ccc2eea962..20a20ac2baa 100644 --- a/sysdeps/unix/sysv/linux/ia64/swapcontext.c +++ b/sysdeps/unix/sysv/linux/ia64/swapcontext.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001 Free Software Foundation, Inc. +/* Copyright (C) 2001-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by David Mosberger-Tang . @@ -25,7 +25,7 @@ struct rv }; extern struct rv __getcontext (ucontext_t *__ucp) __THROW; -extern int __setcontext (__const ucontext_t *__ucp) __THROW; +extern int __setcontext (const ucontext_t *__ucp) __THROW; int __swapcontext (ucontext_t *oucp, const ucontext_t *ucp)