* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@41493 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ABOUT-GCC-NLS b/gcc/ABOUT-GCC-NLS
index 3371483..e6e1527 100644 (file)
--- a/gcc/ABOUT-GCC-NLS
+++ b/gcc/ABOUT-GCC-NLS
@@ -36,15 +36,10 @@ line, where MSGID does not contain `%' or `}', corresponds to a
 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
 rebuilt.

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9ef7497..97cb941 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
 2001-04-21  Mark Mitchell  <mark@codesourcery.com>
 
        * flow.c (proagate_one_insn): Remove useless assignment.

diff --git a/gcc/cpperror.c b/gcc/cpperror.c
index 60af7b5..063489d 100644 (file)
--- a/gcc/cpperror.c
+++ b/gcc/cpperror.c
@@ -33,8 +33,11 @@ static void print_containing_files   PARAMS ((cpp_buffer *));
 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.  */