From a439019e7296f1d5c61122fc7531d887d91f2dee Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Sun, 23 Nov 2008 05:07:30 +0000
Subject: [PATCH] Unconditionally undefine __cplusplus symbol for C files.

---
 .../internal/core/pdom/indexer/PDOMIndexerTask.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java
index ea7235fc7d1..016566ce30c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java
@@ -171,14 +171,13 @@ public abstract class PDOMIndexerTask extends AbstractIndexerTask implements IPD
 			scanInfo= provider.getScannerInformation(file);
 			if (scanInfo == null || scanInfo.getDefinedSymbols().isEmpty()) {
 				scanInfo= provider.getScannerInformation(project);
-				if (linkageID == ILinkage.C_LINKAGE_ID) {
-					final Map<String, String> definedSymbols = scanInfo.getDefinedSymbols();
-					definedSymbols.remove("__cplusplus__"); //$NON-NLS-1$
-					definedSymbols.remove("__cplusplus"); //$NON-NLS-1$
-				}
 			}
-		}
-		else {
+			if (linkageID == ILinkage.C_LINKAGE_ID) {
+				final Map<String, String> definedSymbols = scanInfo.getDefinedSymbols();
+				definedSymbols.remove("__cplusplus__"); //$NON-NLS-1$
+				definedSymbols.remove("__cplusplus"); //$NON-NLS-1$
+			}
+		} else {
 			scanInfo= new ScannerInfo();
 		}
 		return scanInfo;