Merge remote-tracking branch 'origin/main' into rebranch

swift-ci · swift-ci · commit 02527d1cf52d · 2021-01-10T22:13:01.000-08:00
diff --git a/stdlib/public/Platform/winsdk.modulemap b/stdlib/public/Platform/winsdk.modulemap
@@ -139,6 +139,11 @@ module WinSDK [system] {
     }
   }
 
+  module ActiveX {
+    header "OCIdl.h"
+    export *
+  }
+
   module Controls {
     module CommCtrl {
       header "CommCtrl.h"
