diff options
author | Brad Hughes <bradhugh@outlook.com> | 2016-12-01 13:35:58 -0500 |
---|---|---|
committer | Brad Hughes <bradhugh@outlook.com> | 2016-12-01 13:35:58 -0500 |
commit | 6acd017c3f3d72d9e56facea1213c5b3523c4cc6 (patch) | |
tree | e7385edbe620729132d031302faa9f085ae9ed9d /src/osd/modules/lib | |
parent | a10fcd31d3d8add2424467f981d4405f06c920fb (diff) |
Update name of DYNAMIC_API macros (nw)
Diffstat (limited to 'src/osd/modules/lib')
-rw-r--r-- | src/osd/modules/lib/osdlib.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/osd/modules/lib/osdlib.h b/src/osd/modules/lib/osdlib.h index 56ddf26761a..afcc5229371 100644 --- a/src/osd/modules/lib/osdlib.h +++ b/src/osd/modules/lib/osdlib.h @@ -102,7 +102,7 @@ protected: //========================================================================================================= // Dynamic API helpers. Useful in creating a class members that expose dynamically bound API functions. // -// DYNAMIC_API(dxgi, "dxgi.dll") +// OSD_DYNAMIC_API(dxgi, "dxgi.dll") // DYNAMIC_API_FN(dxgi, DWORD, WINAPI, CreateDXGIFactory1, REFIID, void**) // // Calling then looks like: DYNAMIC_CALL(CreateDXGIFactory1, p1, p2, etc) @@ -110,17 +110,17 @@ protected: #if !defined(OSD_UWP) -#define DYNAMIC_API(apiname, ...) osd::dynamic_module::ptr m_##apiname##module = osd::dynamic_module::open( { __VA_ARGS__ } ) -#define DYNAMIC_API_FN(apiname, ret, conv, fname, ...) ret(conv *m_##fname##_pfn)( __VA_ARGS__ ) = m_##apiname##module->bind<ret(conv *)( __VA_ARGS__ )>(#fname) -#define DYNAMIC_CALL(fname, ...) (*m_##fname##_pfn) ( __VA_ARGS__ ) -#define DYNAMIC_API_TEST(fname) (m_##fname##_pfn != nullptr) +#define OSD_DYNAMIC_API(apiname, ...) osd::dynamic_module::ptr m_##apiname##module = osd::dynamic_module::open( { __VA_ARGS__ } ) +#define OSD_DYNAMIC_API_FN(apiname, ret, conv, fname, ...) ret(conv *m_##fname##_pfn)( __VA_ARGS__ ) = m_##apiname##module->bind<ret(conv *)( __VA_ARGS__ )>(#fname) +#define OSD_DYNAMIC_CALL(fname, ...) (*m_##fname##_pfn) ( __VA_ARGS__ ) +#define OSD_DYNAMIC_API_TEST(fname) (m_##fname##_pfn != nullptr) #else -#define DYNAMIC_API(apiname, ...) -#define DYNAMIC_API_FN(apiname, ret, conv, fname, ...) -#define DYNAMIC_CALL(fname, ...) fname( __VA_ARGS__ ) -#define DYNAMIC_API_TEST(fname) (true) +#define OSD_DYNAMIC_API(apiname, ...) +#define OSD_DYNAMIC_API_FN(apiname, ret, conv, fname, ...) +#define OSD_DYNAMIC_CALL(fname, ...) fname( __VA_ARGS__ ) +#define OSD_DYNAMIC_API_TEST(fname) (true) #endif |