# HG changeset patch
# User timkelly
# Date 1250542305 18000
# Node ID b6b7ad8a25a38dfaf9a4594cd447a14e7670287e
# Parent  d8439c154fc728abf729698c843785e84d6dd906# Parent  ef1589eec61f2bb30c4ea8f5258a36820f7bd9c6
merge commit

diff -r ef1589eec61f -r b6b7ad8a25a3 cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java
--- a/cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java	Mon Aug 17 12:25:30 2009 -0500
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java	Mon Aug 17 15:51:45 2009 -0500
@@ -53,8 +53,7 @@
 			@Override
 			public int getSeverity(Matcher matcher) {
 				String warningGroup = matcher.group(4);
-				if (warningGroup != null && (warningGroup.toLowerCase().endsWith("warning:") || //$NON-NLS-1$
-						warningGroup.trim().toLowerCase().startsWith("warning:")) ) { //$NON-NLS-1$
+				if (warningGroup != null && warningGroup.toLowerCase().endsWith("warning")) { //$NON-NLS-1$
 					return IMarkerGenerator.SEVERITY_WARNING;
 				}
 				
diff -r ef1589eec61f -r b6b7ad8a25a3 cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties
--- a/cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties	Mon Aug 17 12:25:30 2009 -0500
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties	Mon Aug 17 15:51:45 2009 -0500
@@ -16,7 +16,7 @@
 GCCErrorParser_skip_forEachFunction=for each function it appears in.\\)
 GCCErrorParser_skip_note=: note:
 GCCErrorParser_sikp_instantiatedFromHere=instantiated from 
-GCCErrorParser_Warnings=(.*?):([0-9]+):([0-9]+:)?(.*[([Ww]arning)(WARNING)([Ee]rror)]:)? (.*)
+GCCErrorParser_Warnings=(.*?):([0-9]+):([0-9]+:)? (.*[Ww]arning|WARNING|[Ee]rror):? (.*)
 GLDErrorParser_error_text=(.*)\\(\\.text\\+.*\\): (.*)
 GLDErrorParser_warning_general=ld(\\.exe)?: [Ww]arning:? (.*)
 GLDErrorParser_error_general=ld(\\.exe)?: (.*)