aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--libio/libio.h5
-rw-r--r--locale/programs/config.h4
-rw-r--r--stdlib/strtol_l.c13
4 files changed, 11 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index e62d483..2ae7308 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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/arena.c (arena_get2): Really don't call __get_nprocs if
diff --git a/libio/libio.h b/libio/libio.h
index 8997524..c37211f 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 606aa02..903db20 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 9181bf1..325c01c 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 <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