File tree Expand file tree Collapse file tree 4 files changed +16
-4
lines changed Expand file tree Collapse file tree 4 files changed +16
-4
lines changed Original file line number Diff line number Diff line change 17
17
18
18
#if defined(_LIBCPP_ABI_VCRUNTIME)
19
19
# include < new.h>
20
+ // <new.h> does not define 'get_new_handler'
21
+ // which makes the 'std' module build fail, this fixes it
22
+ namespace std {
23
+ _LIBCPP_EXPORTED_FROM_ABI new_handler get_new_handler () _NOEXCEPT;
24
+ }
20
25
#else
21
26
_LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD
22
27
typedef void (*new_handler)();
Original file line number Diff line number Diff line change @@ -14,15 +14,17 @@ export {
14
14
15
15
using ::timespec _LIBCPP_USING_IF_EXISTS;
16
16
using ::tm _LIBCPP_USING_IF_EXISTS;
17
-
18
17
using ::asctime _LIBCPP_USING_IF_EXISTS;
19
18
using ::clock _LIBCPP_USING_IF_EXISTS;
19
+ using ::strftime _LIBCPP_USING_IF_EXISTS;
20
+
21
+ #ifndef _LIBCPP_ABI_VCRUNTIME
20
22
using ::ctime _LIBCPP_USING_IF_EXISTS;
21
23
using ::difftime _LIBCPP_USING_IF_EXISTS;
22
24
using ::gmtime _LIBCPP_USING_IF_EXISTS;
23
25
using ::localtime _LIBCPP_USING_IF_EXISTS;
24
26
using ::mktime _LIBCPP_USING_IF_EXISTS;
25
- using ::strftime _LIBCPP_USING_IF_EXISTS;
26
27
using ::time _LIBCPP_USING_IF_EXISTS;
27
28
using ::timespec_get _LIBCPP_USING_IF_EXISTS;
29
+ #endif
28
30
} // export
Original file line number Diff line number Diff line change @@ -51,6 +51,9 @@ module;
51
51
#include < cstdio>
52
52
#include < cstdlib>
53
53
#include < cstring>
54
+ #ifdef _LIBCPP_ABI_VCRUNTIME
55
+ #define _BUILD_STD_MODULE
56
+ #endif
54
57
#include < ctime>
55
58
#include < cuchar>
56
59
#include < cwchar>
Original file line number Diff line number Diff line change @@ -14,15 +14,17 @@ export namespace std {
14
14
15
15
using std::timespec _LIBCPP_USING_IF_EXISTS;
16
16
using std::tm _LIBCPP_USING_IF_EXISTS;
17
-
18
17
using std::asctime _LIBCPP_USING_IF_EXISTS;
19
18
using std::clock _LIBCPP_USING_IF_EXISTS;
19
+ using std::strftime _LIBCPP_USING_IF_EXISTS;
20
+
21
+ #ifndef _LIBCPP_ABI_VCRUNTIME
20
22
using std::ctime _LIBCPP_USING_IF_EXISTS;
21
23
using std::difftime _LIBCPP_USING_IF_EXISTS;
22
24
using std::gmtime _LIBCPP_USING_IF_EXISTS;
23
25
using std::localtime _LIBCPP_USING_IF_EXISTS;
24
26
using std::mktime _LIBCPP_USING_IF_EXISTS;
25
- using std::strftime _LIBCPP_USING_IF_EXISTS;
26
27
using std::time _LIBCPP_USING_IF_EXISTS;
27
28
using std::timespec_get _LIBCPP_USING_IF_EXISTS;
29
+ #endif
28
30
} // namespace std
You can’t perform that action at this time.
0 commit comments