Remove duplicate define from microsoft_sal.cfg (#5957)

danmar · Feb 7, 2024 · ab4e462 · ab4e462
1 parent d449ee6
commit ab4e462
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
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);
+        }
     }
 };