From: Shujing Zhao <pearly.zhao@oracle.com>
Date: Fri, 22 Jan 2010 02:50:44 +0000 (+0000)
Subject: exgettext: Handle the functions and the macro definitions that the arguments are... 
X-Git-Tag: releases/gcc-4.5.0~1101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3c375f58f1905f0d69089aac5835dad2bdd7b76;p=thirdparty%2Fgcc.git

exgettext: Handle the functions and the macro definitions that the arguments are broken...

2010-01-22  Shujing Zhao  <pearly.zhao@oracle.com>

        * exgettext: Handle the functions and the macro definitions that the
        arguments are broken into more than one line.

From-SVN: r156168
---

diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index 3e0cf425227f..ccab0c2d15a1 100644
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-22  Shujing Zhao  <pearly.zhao@oracle.com>
+
+	* exgettext: Handle the functions and the macro definitions that the
+	arguments are broken into more than one line.
+
 2010-01-20  Joseph Myers  <joseph@codesourcery.com>
 
 	* zh_CN.po: Update.
diff --git a/gcc/po/exgettext b/gcc/po/exgettext
index 7ff3799fa207..35f81a7d1724 100644
--- a/gcc/po/exgettext
+++ b/gcc/po/exgettext
@@ -184,6 +184,18 @@ END {
 	while (getline < file) {
 	    if (/^(#[ 	]*define[ 	]*)?[A-Za-z_].*\(.*msgid[,\)]/) {
 		keyword_option($0)
+	    } else if (/^(#[   ]*define[       ]*)?[A-Za-z_].*(\(|\(.*,)$/) {
+		name_line = $0
+		while (getline < file) {
+		  lineno++
+		  if (/msgid[,\)]/){
+		    keyword_option(name_line $0)
+		    break
+		  } else if (/,$/) {
+		      name_line = name_line $0
+		      continue
+		  } else break
+		}
 	    } else if (/%e/ || /%n/) {
 		spec_error_string($0)
 	    }