# HG changeset patch
# User timkelly
# Date 1282776905 18000
# Node ID 9c8b9f280200f1bc5ad8e3602b654d7ea0244664
# Parent  d61921bcf8f341ad7143065f86cbc29b6563a1d0# Parent  988b4ab1b8c1a166c31b8cfb7dacc9f57cad93f5
merge commit

diff -r 988b4ab1b8c1 -r 9c8b9f280200 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java	Wed Aug 25 15:37:23 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java	Wed Aug 25 17:55:05 2010 -0500
@@ -311,7 +311,7 @@
 		
 		// now create the path entries for the macros
 		for (IDefine define : projectDefines) {
-			macroEntries.add(new CMacroEntry(define.getName(), define.getExpansion(), 0));
+			macroEntries.add(new CMacroEntry(define.getNameAndArguments(), define.getExpansion(), 0));
 		}
 		
 		// get the list of files the engine references when parsing the bld.inf and mmp files
diff -r 988b4ab1b8c1 -r 9c8b9f280200 carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/gold_header.png
diff -r 988b4ab1b8c1 -r 9c8b9f280200 core/com.nokia.carbide.cpp.compiler.doc.user/html/images/gold_header.png