diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java
index 810a43752af..c06cecb06ef 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java
@@ -83,19 +83,16 @@ public class GCCSpecsConsoleParser implements IScannerInfoConsoleParser {
 					}
                 }
 
-                // Now defineParts[1] is the symbol name, and [2] is the
-                // definition
+                // Now defineParts[1] is the symbol name, and [2] is the definition
                 String symbol = null;
-				switch (defineParts.length) {
-					case 2:
-						symbol = defineParts[1];
-						break;
-					case 3:
-						symbol = defineParts[1] + "=" + defineParts[2]; //$NON-NLS-1$
-						break;
-				}
-				if (symbol != null && !symbols.contains(symbol)) { 
-					symbols.add(symbol);
+                if (defineParts.length > 1) {
+                	symbol = defineParts[1] + "="; //$NON-NLS-1$
+                	if (defineParts.length > 2) {
+                		symbol += defineParts[2];
+                	}
+                	if (!symbols.contains(symbol)) { 
+                		symbols.add(symbol);
+                	}
 				}
 			}
 		}