merge commit
authortimkelly
Wed, 25 Aug 2010 17:55:05 -0500
changeset 1887 9c8b9f280200
parent 1886 d61921bcf8f3 (diff)
parent 1885 988b4ab1b8c1 (current diff)
child 1888 fc9d5d520518
merge commit
--- 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