i18n Update

Philipp Thomas pthomas@suse.de
Sat Apr 21 19:17:00 GMT 2001


I finally found the reason why we got the warnings from xgettext about
nested keyword args. The exgettext script mistakenly took the v_message
macro definition for a function definition and thus erroneously added
vprintf:2 as a keyword arg. A simple space before the do corrected this.
While this is brittle, I coudn't think of a better fix. IMHO this is the
kind of error you get when you use a script to parse source code.

And while I was at it, I finally changed ABOUT-GCC-NLS to reflect the
current situation. 

Bootstrapped on i686-suse-linux without regressions and commited to HEAD.
I will update the branch as soon as I've updated my copy and have done a
bootstrap.

Patches for the po subdir to follow.

Next step after that will be to update the intl subdir and the configure
macros to the code from gettext 0.10.37.

2001-04-22  Philipp Thomas  <pthomas@suse.de>

	* ABOUT-GCC-NLS: Now that gettext 0.10.37 is out,
	require it instead of the CVS version.
        * cpperror.c (v_message): Put a blank before the macro
        body to not confuse exgettext.

Index: ABOUT-GCC-NLS
===================================================================
RCS file: /cvs/gcc/egcs/gcc/ABOUT-GCC-NLS,v
retrieving revision 1.4
diff -u -r1.4 ABOUT-GCC-NLS
--- ABOUT-GCC-NLS	2000/11/07 17:45:31	1.4
+++ ABOUT-GCC-NLS	2001/04/22 01:33:47
@@ -36,14 +36,9 @@
 message MSGID that requires translation; this is needed to identify
 diagnostics in GCC spec strings.
 
-If you modify source files, you'll need to use a special version of the
+If you modify source files, you'll need at least version 0.10.37 of the
 GNU gettext package to propagate the modifications to the translation
 tables.
-
-All patches needed for GCC have been incorporated into the official
-gettext CVS. These sources may be accessed via anonymous cvs. The root for
-the gettext CVS is :pserver:anoncvs@anoncvs.cygnus.com:/cvs/gettext
-Password is `anoncvs' like for the GCC CVS.
 
 After having built and installed these gettext tools, you have to
 configure GCC with --enable-maintainer-mode to get the master catalog
Index: cpperror.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cpperror.c,v
retrieving revision 1.46
diff -u -r1.46 cpperror.c
--- cpperror.c	2001/04/08 10:01:18	1.46
+++ cpperror.c	2001/04/22 01:33:47
@@ -33,8 +33,11 @@
 static void print_location		PARAMS ((cpp_reader *,
 						 const char *,
 						 const cpp_lexer_pos *));
+
+/* Don't remove the blank before do, as otherwise the exgettext
+   script will mistake this as a function definition */
 #define v_message(msgid, ap) \
-do { vfprintf (stderr, _(msgid), ap); putc ('\n', stderr); } while (0)
+ do { vfprintf (stderr, _(msgid), ap); putc ('\n', stderr); } while (0)
 
 /* Print the file names and line numbers of the #include
    commands which led to the current file.  */

-- 
Philipp Thomas <pthomas@suse.de>
Development, SuSE GmbH, Schanzaecker Str. 10, D-90443 Nuremberg, Germany

Penguins shall save the dinosaurs
                          -- Handelsblatt about Linux on S/390



More information about the Gcc-patches mailing list