From bedad0d902c869f92c73774aaae4e121191efa66 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 25 May 2016 19:53:22 +0000 Subject: [PATCH] Make sure the code runs via C --- source/HMD_Bridge_API.h | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/source/HMD_Bridge_API.h b/source/HMD_Bridge_API.h index 1984aa3..261a7f4 100755 --- a/source/HMD_Bridge_API.h +++ b/source/HMD_Bridge_API.h @@ -7,6 +7,23 @@ #endif +/* C API */ +#if defined(_WIN32) || defined(_WIN64) +#ifdef __cplusplus +#define EXPORT_LIB extern "C" __declspec(dllimport) +#else +#define EXPORT_LIB __declspec(dllimport) +#endif +#else +#ifdef __cplusplus +#define EXPORT_LIB extern "C" +#else +#define EXPORT_LIB +#endif +#endif + +#ifdef __cplusplus + /* C++ API */ #if defined(_WIN32) || defined(_WIN64) #if !defined(DllExport) @@ -17,12 +34,6 @@ #define DllExport #endif -/* C API */ -#if defined(_WIN32) || defined(_WIN64) -#define EXPORT_LIB extern "C" __declspec(dllimport) -#else -#define EXPORT_LIB extern "C" -#endif /* Forward declarations */ class Backend; @@ -82,6 +93,10 @@ protected: Backend *m_hmd; }; +#endif /* __cplusplus */ + + +/* C API */ /* Debug wrapper */ #ifdef DEBUG_BRIDGE -- GitLab