Skip to content

Commit b5bf13a

Browse files
authored
Merge pull request #5944 from compnerd/windows-runtime
2 parents dbf92de + 44fbfd6 commit b5bf13a

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

stdlib/public/runtime/ImageInspectionWin32.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "swift/Runtime/Debug.h"
2323
#include <cstdlib>
2424
#include <cstring>
25+
#include <vector>
2526

2627
#define WIN32_LEAN_AND_MEAN
2728
#define NOMINMAX
@@ -198,8 +199,8 @@ void swift::initializeProtocolConformanceLookup() {
198199
// FIXME: Find a way to have this continue to happen for dlopen-ed images.
199200
// rdar://problem/19045112
200201
const InspectArgs ProtocolConformancesArgs = {
202+
addImageProtocolConformanceBlockCallback,
201203
ProtocolConformancesSection,
202-
addImageProtocolConformanceBlockCallback
203204
};
204205
_swift_dl_iterate_phdr(_addImageCallback, &ProtocolConformancesArgs);
205206
}
@@ -210,8 +211,8 @@ void swift::initializeTypeMetadataRecordLookup() {
210211
// FIXME: Find a way to have this continue to happen for dlopen-ed images.
211212
// rdar://problem/19045112
212213
const InspectArgs TypeMetadataRecordsArgs = {
214+
addImageTypeMetadataRecordBlockCallback,
213215
TypeMetadataRecordsSection,
214-
addImageTypeMetadataRecordBlockCallback
215216
};
216217
_swift_dl_iterate_phdr(_addImageCallback, &TypeMetadataRecordsArgs);
217218
}

stdlib/public/runtime/ProtocolConformance.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
#include "swift/Runtime/Mutex.h"
2222
#include "ImageInspection.h"
2323
#include "Private.h"
24+
#if !defined(_WIN32)
2425
#include <dlfcn.h>
26+
#endif
2527

2628
using namespace swift;
2729

0 commit comments

Comments
 (0)