This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Get rid of PARAMS macro
- From: Marek Polacek <polacek at redhat dot com>
- To: libc-alpha <libc-alpha at sourceware dot org>
- Cc: "Joseph S. Myers" <joseph at codesourcery dot com>
- Date: Fri, 27 Jan 2012 19:46:57 +0100
- Subject: [PATCH] Get rid of PARAMS macro
This patch removes PARAMS macros. There are only a few of them,
as main user of PARAMS is the intl/ directory and I didn't touch those
since glibc is not the master.
Joseph, in strtol_l.c I've had to remove one __STDC__ conditional,
so I hope it won't clash with your changes somehow.
And uh, maybe I shouldn't have removed _PARAMS from libio.h...
2012-01-27 Marek Polacek <polacek@redhat.com>
* libio/libio.h: Don't define _PARAMS.
* programs/config.h: Don't define PARAMS.
* stdlib/strtol_l.c: Likewise.
(__strtol_l): Remove PARAMS from the prototype.
--- libc/libio/libio.h.mp 2012-01-27 17:31:03.485966415 +0100
+++ libc/libio/libio.h 2012-01-27 19:05:59.171107731 +0100
@@ -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
--- libc/stdlib/strtol_l.c.mp 2012-01-27 19:08:56.952655788 +0100
+++ libc/stdlib/strtol_l.c 2012-01-27 19:42:01.846759060 +0100
@@ -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
--- libc/locale/programs/config.h.mp 2012-01-27 19:12:34.777078224 +0100
+++ libc/locale/programs/config.h 2012-01-27 19:12:43.229094614 +0100
@@ -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
Marek