Skip to content

Commit 3564927

Browse files
authored
Merge pull request #41716 from apple/revert-41698-exports
Revert "visualc: clean up the module definition"
2 parents 7ca4f88 + 0bc375d commit 3564927

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

stdlib/public/Platform/visualc.modulemap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,24 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
module visualc [system] {
14-
export *
15-
1614
module SAL {
1715
header "sal.h"
16+
export *
1817
}
1918

2019
module vcruntime {
2120
header "vcruntime.h"
22-
export SAL
21+
export *
2322
}
2423

2524
module setjmp {
2625
header "setjmp.h"
26+
export *
2727
}
2828

2929
module stdint {
3030
header "stdint.h"
31+
export *
3132
}
3233
}
3334

stdlib/public/SwiftShims/SwiftStdint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
// Clang has been defining __INTxx_TYPE__ macros for a long time.
2626
// __UINTxx_TYPE__ are defined only since Clang 3.5.
27-
#if !defined(__APPLE__) && (defined(_MSC_VER) && !defined(__clang__)) && !defined(__linux__) && !defined(__OpenBSD__)
27+
#if !defined(__APPLE__) && !defined(__linux__) && !defined(__OpenBSD__)
2828
#include <stdint.h>
2929
typedef int64_t __swift_int64_t;
3030
typedef uint64_t __swift_uint64_t;

0 commit comments

Comments
 (0)