Merge branch 'master' of ssh://sourceware.org/git/glibc

This commit is contained in:
Ulrich Drepper 2012-01-31 18:50:35 -05:00
commit 9d029511d8
7 changed files with 23 additions and 57 deletions

View File

@ -1,3 +1,17 @@
2012-01-31 Joseph Myers <joseph@codesourcery.com>
* 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 <polacek@redhat.com>
* 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 <drepper@gmail.com>
* malloc/malloc.c: Remove name translation. Don't use mixed-cap

View File

@ -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

View File

@ -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

View File

@ -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 <drepper@cygnus.com>, 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

View File

@ -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)

View File

@ -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

View File

@ -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)