Skip to content

Commit c42529c

Browse files
Merge pull request #325 from GameTechDev/feature/c-int-connect
pmOpenSession_ C linkage
2 parents 964064f + a61d731 commit c42529c

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,7 @@ PresentMon/PresentMon.args.json
3939
PresentData/PresentData.args.json
4040

4141
IntelPresentMon/SampleClient/log.txt
42+
43+
IntelPresentMon/PresentMonAPI2/Internal.h
44+
45+
IntelPresentMon/CommonUtilities/git_hash.h

IntelPresentMon/CommonUtilities/git_hash.h

Lines changed: 0 additions & 2 deletions
This file was deleted.

IntelPresentMon/PresentMonAPI2/Internal.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,21 @@
77
#include <memory>
88
#include <functional>
99

10+
#ifdef __cplusplus
11+
extern "C" {
12+
#endif
13+
PRESENTMON_API2_EXPORT PM_STATUS pmOpenSession_(PM_SESSION_HANDLE* pHandle, const char* pipeNameOverride, const char* introNsmOverride);
14+
#ifdef __cplusplus
15+
}
16+
#endif
1017

18+
// testing support functions
1119
PRESENTMON_API2_EXPORT void pmSetMiddlewareAsMock_(bool mocked, bool useCrtHeapDebug = false, bool useLocalShmServer = true);
1220
PRESENTMON_API2_EXPORT _CrtMemState pmCreateHeapCheckpoint_();
1321
PRESENTMON_API2_EXPORT PM_STATUS pmMiddlewareSpeak_(PM_SESSION_HANDLE handle, char* buffer);
1422
PRESENTMON_API2_EXPORT PM_STATUS pmMiddlewareAdvanceTime_(PM_SESSION_HANDLE handle, uint32_t milliseconds);
15-
PRESENTMON_API2_EXPORT PM_STATUS pmOpenSession_(PM_SESSION_HANDLE* pHandle, const char* pipeNameOverride, const char* introNsmOverride);
1623

24+
// log configuration support functions
1725
struct LoggingSingletons
1826
{
1927
std::function<pmon::util::log::GlobalPolicy& ()> getGlobalPolicy;

0 commit comments

Comments
 (0)