fix multiple definitions of MAX_FILE_TYPE in VS-SDK

rainers · rainers · commit 6b47c695f174 · 2025-03-10T08:13:56.000+01:00
diff --git a/CHANGES b/CHANGES
@@ -1401,7 +1401,7 @@ Version history
   * now works with Visual Studio for Windows on ARM64
   * installer now supports 4 parallel installations of VS 2022
 
-2025-03-02 version 1.4.0
+2025-03-09 version 1.4.0
   * added separate version of dbuild.dll linked against Microsoft.Build.CPPTasks.Common for VS 17.14
   * mago: fixed showing intellisense information in tool tip while debugging in VS2022
   * mago: expression evaluator now resolves identifiers of named enumerator types
diff --git a/c2d/idl2d.d b/c2d/idl2d.d
@@ -1444,9 +1444,9 @@ version(all)
 		{
 			replaceTokenSequence(tokens, "#ifndef INTEROPLIB\n[in] $ifcode\n#else\n$elsecode\n#endif", "[in] $ifcode", false);
 		}
-		if(currentModule == "textmgr120")
+		if(currentModule.startsWith("textmgr"))
 		{
-			// duplicate #define
+			// declaration in textmgr.idl is in enum
 			replaceTokenSequence(tokens, "#define MAX_FILE_TYPE 24", "", false);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1444,9 +1444,9 @@ version(all)`
`1444`	`1444`	`{`
`1445`	`1445`	`replaceTokenSequence(tokens, "#ifndef INTEROPLIB\n[in] $ifcode\n#else\n$elsecode\n#endif", "[in] $ifcode", false);`
`1446`	`1446`	`}`
`1447`		`- if(currentModule == "textmgr120")`
	`1447`	`+ if(currentModule.startsWith("textmgr"))`
`1448`	`1448`	`{`
`1449`		`- // duplicate #define`
	`1449`	`+ // declaration in textmgr.idl is in enum`
`1450`	`1450`	`replaceTokenSequence(tokens, "#define MAX_FILE_TYPE 24", "", false);`
`1451`	`1451`	`}`
`1452`	`1452`