merge from gcc

[deliverable/binutils-gdb.git] / libiberty / cp-demint.c

diff --git a/libiberty/cp-demint.c b/libiberty/cp-demint.c
index 533202dd10481398e7e54cca6c41d3c4f2fa469b..8c200baed9a7e1273751b0d22f3d6f48c472a8a2 100644 (file)
--- a/libiberty/cp-demint.c
+++ b/libiberty/cp-demint.c
@@ -56,11 +56,10 @@
 /* Fill in most component types.  */
 
 int
-cplus_demangle_fill_component (p, type, left, right)
-     struct demangle_component *p;
-     enum demangle_component_type type;
-     struct demangle_component *left;
-     struct demangle_component *right;
+cplus_demangle_fill_component (struct demangle_component *p,
+                               enum demangle_component_type type,
+                               struct demangle_component *left,
+                                struct demangle_component *right)
 {
   if (p == NULL)
     return 0;
@@ -130,9 +129,8 @@ cplus_demangle_fill_component (p, type, left, right)
 /* Fill in a DEMANGLE_COMPONENT_BUILTIN_TYPE.  */
 
 int
-cplus_demangle_fill_builtin_type (p, typename)
-     struct demangle_component *p;
-     const char *typename;
+cplus_demangle_fill_builtin_type (struct demangle_component *p,
+                                  const char *typename)
 {
   int len;
   unsigned int i;
@@ -156,10 +154,8 @@ cplus_demangle_fill_builtin_type (p, typename)
 /* Fill in a DEMANGLE_COMPONENT_OPERATOR.  */
 
 int
-cplus_demangle_fill_operator (p, opname, args)
-     struct demangle_component *p;
-     const char *opname;
-     int args;
+cplus_demangle_fill_operator (struct demangle_component *p,
+                              const char *opname, int args)
 {
   int len;
   unsigned int i;
@@ -184,10 +180,7 @@ cplus_demangle_fill_operator (p, opname, args)
 /* Translate a mangled name into components.  */
 
 struct demangle_component *
-cplus_demangle_v3_components (mangled, options, mem)
-     const char *mangled;
-     int options;
-     void **mem;
+cplus_demangle_v3_components (const char *mangled, int options, void **mem)
 {
   size_t len;
   int type;