From 69db4f8f463e509a3e5ccc00e70aa9f94c359d34 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Tue, 31 Jan 2012 20:02:53 +0000 Subject: Remove PARAMS macros. --- ChangeLog | 7 +++++++ libio/libio.h | 5 ----- locale/programs/config.h | 4 ---- stdlib/strtol_l.c | 13 ++++--------- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index e62d483b07..2ae7308223 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-01-31 Marek Polacek + + * libio/libio.h: Don't define _PARAMS. + * locale/programs/config.h: Don't define PARAMS. + * stdlib/strtol_l.c: Likewise. + (__strtol_l): Remove PARAMS from the prototype. + 2012-01-31 Ulrich Drepper * malloc/arena.c (arena_get2): Really don't call __get_nprocs if diff --git a/libio/libio.h b/libio/libio.h index 8997524829..c37211f8ec 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -67,11 +67,6 @@ # endif #endif /*!__P*/ -/* For backward compatibility */ -#ifndef _PARAMS -# define _PARAMS(protos) __P(protos) -#endif /*!_PARAMS*/ - #define _IO_UNIFIED_JUMPTABLES 1 #ifndef _G_HAVE_PRINTF_FP # define _IO_USE_DTOA 1 diff --git a/locale/programs/config.h b/locale/programs/config.h index 606aa02cbf..903db20917 100644 --- a/locale/programs/config.h +++ b/locale/programs/config.h @@ -29,10 +29,6 @@ #define DEFAULT_CHARMAP "ANSI_X3.4-1968" /* ASCII */ -#ifndef PARAMS -# define PARAMS(args) args -#endif - /* This must be one higer than the last used LC_xxx category value. */ #define __LC_LAST 13 diff --git a/stdlib/strtol_l.c b/stdlib/strtol_l.c index 9181bf10ee..325c01cac8 100644 --- a/stdlib/strtol_l.c +++ b/stdlib/strtol_l.c @@ -1,5 +1,6 @@ /* Convert string representing a number to integer value, using given locale. - Copyright (C) 1997, 2002, 2004, 2006, 2007, 2010 Free Software Foundation, Inc. + Copyright (C) 1997, 2002, 2004, 2006, 2007, 2010, 2012 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -536,16 +537,10 @@ libc_hidden_def (INTERNAL (__strtol_l)) /* External user entry point. */ #if _LIBC - 0 == 0 -# undef PARAMS -# if defined (__STDC__) && __STDC__ -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif /* Prototype. */ -extern INT __strtol_l PARAMS ((const STRING_TYPE *nptr, STRING_TYPE **endptr, - int base)); +extern INT __strtol_l (const STRING_TYPE *nptr, STRING_TYPE **endptr, + int base); #endif -- cgit 1.4.1 From d55bf1777c59c6a1d05ccc3b9f7d54299da770a9 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 31 Jan 2012 22:57:02 +0000 Subject: Always define float_t as float for PowerPC, SH and SPARC. --- ChangeLog | 7 +++++++ sysdeps/powerpc/bits/mathdef.h | 16 ++-------------- sysdeps/sh/sh4/bits/mathdef.h | 16 ++-------------- sysdeps/sparc/bits/mathdef.h | 12 +----------- 4 files changed, 12 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ae7308223..a87f1e658d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-01-31 Joseph Myers + + * sysdeps/powerpc/bits/mathdef.h (float_t): Always define as + float. + * sysdeps/sh/sh4/bits/mathdef.h: Likewise. + * sysdeps/sparc/bits/mathdef.h: Likewise. + 2012-01-31 Marek Polacek * libio/libio.h: Don't define _PARAMS. diff --git a/sysdeps/powerpc/bits/mathdef.h b/sysdeps/powerpc/bits/mathdef.h index 3a9b1b0459..c5eee15b72 100644 --- a/sysdeps/powerpc/bits/mathdef.h +++ b/sysdeps/powerpc/bits/mathdef.h @@ -31,22 +31,10 @@ #if defined __USE_ISOC99 && defined _MATH_H && !defined _MATH_H_MATHDEF # define _MATH_H_MATHDEF 1 -# ifdef __GNUC__ - -/* gcc leaves `float' expressions as-is. */ -typedef float float_t; /* `float' expressions are evaluated as - `float'. */ -typedef double double_t; /* `double' expressions are evaluated as - `double'. */ - -# else - -/* Wild guess at types for float_t and double_t. */ -typedef double float_t; +/* PowerPC has both `float' and `double' arithmetic. */ +typedef float float_t; typedef double double_t; -# endif - /* The values returned by `ilogb' for 0 and NaN respectively. */ # define FP_ILOGB0 (-2147483647) # define FP_ILOGBNAN (2147483647) diff --git a/sysdeps/sh/sh4/bits/mathdef.h b/sysdeps/sh/sh4/bits/mathdef.h index 5b92234983..74f76029b4 100644 --- a/sysdeps/sh/sh4/bits/mathdef.h +++ b/sysdeps/sh/sh4/bits/mathdef.h @@ -31,22 +31,10 @@ #if defined __USE_ISOC99 && defined _MATH_H && !defined _MATH_H_MATHDEF # define _MATH_H_MATHDEF 1 -# ifdef __GNUC__ - -/* gcc leaves `float' expressions as-is. */ -typedef float float_t; /* `float' expressions are evaluated as - `float'. */ -typedef double double_t; /* `double' expressions are evaluated as - `double'. */ - -# else - -/* Wild guess at types for float_t and double_t. */ -typedef double float_t; +/* SH has both `float' and `double' arithmetic. */ +typedef float float_t; typedef double double_t; -# endif - /* The values returned by `ilogb' for 0 and NaN respectively. */ # define FP_ILOGB0 0x80000001 # define FP_ILOGBNAN 0x7fffffff diff --git a/sysdeps/sparc/bits/mathdef.h b/sysdeps/sparc/bits/mathdef.h index 042c9c881b..cd1f85acc8 100644 --- a/sysdeps/sparc/bits/mathdef.h +++ b/sysdeps/sparc/bits/mathdef.h @@ -29,20 +29,10 @@ #if defined __USE_ISOC99 && defined _MATH_H && !defined _MATH_H_MATHDEF # define _MATH_H_MATHDEF 1 -# ifdef __GNUC__ - -/* gcc leaves `float' expressions as-is. */ +/* SPARC has both `float' and `double' arithmetic. */ typedef float float_t; typedef double double_t; -# else - -/* Wild guess at types for float_t and double_t. */ -typedef double float_t; -typedef double double_t; - -# endif - /* The values returned by `ilogb' for 0 and NaN respectively. */ # define FP_ILOGB0 (-2147483647) # define FP_ILOGBNAN (2147483647) -- cgit 1.4.1