Regenerated, no abs filenames.

diff --git a/gettext-runtime/intl/plural.c b/gettext-runtime/intl/plural.c
index 3a4fa20cae94ad2fba00dcf4686a55b67a6c4f5d..72494f9eb92243d6f7497f3be09d3ae0e22d9db1 100644 (file)
--- a/gettext-runtime/intl/plural.c
+++ b/gettext-runtime/intl/plural.c
@@ -19,7 +19,7 @@
 #line 1 "plural.y"
 
 /* Expression parsing for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
    This program is free software; you can redistribute it and/or modify it
@@ -75,28 +75,13 @@ typedef union {
 #line 55 "plural.y"
 
 /* Prototypes for local functions.  */
-static struct expression *new_exp PARAMS ((int nargs, enum operator op,
-                                          struct expression * const *args));
-static inline struct expression *new_exp_0 PARAMS ((enum operator op));
-static inline struct expression *new_exp_1 PARAMS ((enum operator op,
-                                                  struct expression *right));
-static struct expression *new_exp_2 PARAMS ((enum operator op,
-                                            struct expression *left,
-                                            struct expression *right));
-static inline struct expression *new_exp_3 PARAMS ((enum operator op,
-                                                  struct expression *bexp,
-                                                  struct expression *tbranch,
-                                                  struct expression *fbranch));
-static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
-static void yyerror PARAMS ((const char *str));
+static int yylex (YYSTYPE *lval, const char **pexp);
+static void yyerror (const char *str);
 
 /* Allocation of expressions.  */
 
 static struct expression *
-new_exp (nargs, op, args)
-     int nargs;
-     enum operator op;
-     struct expression * const *args;
+new_exp (int nargs, enum operator op, struct expression * const *args)
 {
   int i;
   struct expression *newp;
@@ -125,16 +110,13 @@ new_exp (nargs, op, args)
 }
 
 static inline struct expression *
-new_exp_0 (op)
-     enum operator op;
+new_exp_0 (enum operator op)
 {
   return new_exp (0, op, NULL);
 }
 
 static inline struct expression *
-new_exp_1 (op, right)
-     enum operator op;
-     struct expression *right;
+new_exp_1 (enum operator op, struct expression *right)
 {
   struct expression *args[1];
 
@@ -143,10 +125,7 @@ new_exp_1 (op, right)
 }
 
 static struct expression *
-new_exp_2 (op, left, right)
-     enum operator op;
-     struct expression *left;
-     struct expression *right;
+new_exp_2 (enum operator op, struct expression *left, struct expression *right)
 {
   struct expression *args[2];
 
@@ -156,11 +135,8 @@ new_exp_2 (op, left, right)
 }
 
 static inline struct expression *
-new_exp_3 (op, bexp, tbranch, fbranch)
-     enum operator op;
-     struct expression *bexp;
-     struct expression *tbranch;
-     struct expression *fbranch;
+new_exp_3 (enum operator op, struct expression *bexp,
+          struct expression *tbranch, struct expression *fbranch)
 {
   struct expression *args[3];
 
@@ -236,8 +212,8 @@ static const short yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
 static const short yyrline[] =
 {
-       0,   174,   182,   186,   190,   194,   198,   202,   206,   210,
-     214,   218,   223
+       0,   150,   158,   162,   166,   170,   174,   178,   182,   186,
+     190,   194,   199
 };
 #endif
 
@@ -1027,7 +1003,7 @@ yyreduce:
   switch (yyn) {
 
 case 1:
-#line 175 "plural.y"
+#line 151 "plural.y"
 {
            if (yyvsp[0].exp == NULL)
              YYABORT;
@@ -1035,68 +1011,68 @@ case 1:
          }
     break;
 case 2:
-#line 183 "plural.y"
+#line 159 "plural.y"
 {
            yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
          }
     break;
 case 3:
-#line 187 "plural.y"
+#line 163 "plural.y"
 {
            yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
          }
     break;
 case 4:
-#line 191 "plural.y"
+#line 167 "plural.y"
 {
            yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
          }
     break;
 case 5:
-#line 195 "plural.y"
+#line 171 "plural.y"
 {
            yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
          }
     break;
 case 6:
-#line 199 "plural.y"
+#line 175 "plural.y"
 {
            yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
          }
     break;
 case 7:
-#line 203 "plural.y"
+#line 179 "plural.y"
 {
            yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
          }
     break;
 case 8:
-#line 207 "plural.y"
+#line 183 "plural.y"
 {
            yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
          }
     break;
 case 9:
-#line 211 "plural.y"
+#line 187 "plural.y"
 {
            yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
          }
     break;
 case 10:
-#line 215 "plural.y"
+#line 191 "plural.y"
 {
            yyval.exp = new_exp_0 (var);
          }
     break;
 case 11:
-#line 219 "plural.y"
+#line 195 "plural.y"
 {
            if ((yyval.exp = new_exp_0 (num)) != NULL)
              yyval.exp->val.num = yyvsp[0].num;
          }
     break;
 case 12:
-#line 224 "plural.y"
+#line 200 "plural.y"
 {
            yyval.exp = yyvsp[-1].exp;
          }
@@ -1334,13 +1310,12 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 229 "plural.y"
+#line 205 "plural.y"
 
 
 void
 internal_function
-FREE_EXPRESSION (exp)
-     struct expression *exp;
+FREE_EXPRESSION (struct expression *exp)
 {
   if (exp == NULL)
     return;
@@ -1366,9 +1341,7 @@ FREE_EXPRESSION (exp)
 
 
 static int
-yylex (lval, pexp)
-     YYSTYPE *lval;
-     const char **pexp;
+yylex (YYSTYPE *lval, const char **pexp)
 {
   const char *exp = *pexp;
   int result;
@@ -1511,8 +1484,7 @@ yylex (lval, pexp)
 
 
 static void
-yyerror (str)
-     const char *str;
+yyerror (const char *str)
 {
   /* Do nothing.  We don't print error messages here.  */
 }

diff --git a/gettext-tools/src/po-gram-gen.c b/gettext-tools/src/po-gram-gen.c
index ac1d93d33c5ae44b97a18a109ea14aadd38715d4..434c09b90f9275ac6a5c72489415ca5c2eafc627 100644 (file)
--- a/gettext-tools/src/po-gram-gen.c
+++ b/gettext-tools/src/po-gram-gen.c
@@ -31,7 +31,7 @@
 #include "po-lex.h"
 #include "po-charset.h"
 #include "error.h"
-#include "xmalloc.h"
+#include "xalloc.h"
 #include "gettext.h"
 #include "read-po-abstract.h"
 
@@ -1115,7 +1115,7 @@ case 17:
 case 18:
 #line 290 "po-gram-gen.y"
 {
-                 po_callback_comment (yyvsp[0].string.string);
+                 po_callback_comment_dispatcher (yyvsp[0].string.string);
                }
     break;
 }

diff --git a/gettext-tools/src/po-hash-gen.c b/gettext-tools/src/po-hash-gen.c
index 545d4c057ff1d0cf0cb6385d55e2be9fcbc5af1f..b603f84fc61dcc6381aa7799c1649a2a440521a3 100644 (file)
--- a/gettext-tools/src/po-hash-gen.c
+++ b/gettext-tools/src/po-hash-gen.c
@@ -34,7 +34,7 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include "xmalloc.h"
+#include "xalloc.h"
 #include "read-po-abstract.h"
 
 /* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),