Remove duplicate define from microsoft_sal.cfg (danmar#5957)

chrchr-github · web-flow · commit ab4e4624fc6d · 2024-02-07T14:57:04.000+01:00
diff --git a/cfg/microsoft_sal.cfg b/cfg/microsoft_sal.cfg
@@ -338,7 +338,6 @@
   <define name="__blocksOn(resource)" value=""/>
   <define name="__callback" value=""/>
   <define name="__checkReturn" value=""/>
-  <define name="__format_string" value=""/>
   <define name="__in_awcount(expr,size)" value=""/>
   <define name="__nullnullterminated" value=""/>
   <define name="__nullterminated" value=""/>
diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp
@@ -1072,6 +1072,10 @@ class TestLibrary : public TestFixture {
             const Settings s = settingsBuilder().library("std.cfg").library("gnu.cfg").library("bsd.cfg").build();
             ASSERT_EQUALS(s.library.defines.empty(), false);
         }
+        {
+            const Settings s = settingsBuilder().library("std.cfg").library("microsoft_sal.cfg").build();
+            ASSERT_EQUALS(s.library.defines.empty(), false);
+        }
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -1072,6 +1072,10 @@ class TestLibrary : public TestFixture {`
`1072`	`1072`	`const Settings s = settingsBuilder().library("std.cfg").library("gnu.cfg").library("bsd.cfg").build();`
`1073`	`1073`	`ASSERT_EQUALS(s.library.defines.empty(), false);`
`1074`	`1074`	`}`
	`1075`	`+ {`
	`1076`	`+ const Settings s = settingsBuilder().library("std.cfg").library("microsoft_sal.cfg").build();`
	`1077`	`+ ASSERT_EQUALS(s.library.defines.empty(), false);`
	`1078`	`+ }`
`1075`	`1079`	`}`
`1076`	`1080`	`};`
`1077`	`1081`