Skip to content

Commit 7bf11dc

Browse files
authored
Merge pull request #80144 from Steelskin/fabrice/cp-ucrt-modulemap
Update ucrt.modulemap for Windows SDK 10.0.26100
2 parents 1e211b4 + da00b37 commit 7bf11dc

File tree

1 file changed

+28
-11
lines changed

1 file changed

+28
-11
lines changed

stdlib/public/Platform/ucrt.modulemap

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,40 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
module _complex [system] {
13+
// The following modules have to be standalone top-level modules to deal with
14+
// version 10.0.26100 of the Windows SDK.
15+
module _malloc [system] [no_undeclared_includes] {
16+
use corecrt
17+
header "malloc.h"
18+
export *
19+
}
20+
21+
module _complex [system] [no_undeclared_includes] {
22+
use corecrt
23+
use std
1424
header "complex.h"
1525
export *
1626
}
1727

28+
module _stddef [system] [no_undeclared_includes] {
29+
header "stddef.h"
30+
export *
31+
}
32+
33+
module _stdlib [system] [no_undeclared_includes] {
34+
use corecrt
35+
header "stdlib.h"
36+
export *
37+
}
38+
1839
module ucrt [system] {
40+
export _malloc
41+
1942
module C {
43+
export _complex
44+
export _stddef
45+
export _stdlib
46+
2047
module ctype {
2148
header "ctype.h"
2249
export *
@@ -57,11 +84,6 @@ module ucrt [system] {
5784
export *
5885
}
5986

60-
module stddef {
61-
header "stddef.h"
62-
export *
63-
}
64-
6587
module stdio {
6688
header "stdio.h"
6789
export *
@@ -132,11 +154,6 @@ module ucrt [system] {
132154
export *
133155
}
134156

135-
module malloc {
136-
header "malloc.h"
137-
export *
138-
}
139-
140157
module minmax {
141158
header "minmax.h"
142159
export *

0 commit comments

Comments
 (0)