diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-07-08 14:32:52 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-07-08 14:32:52 +0200 |
| commit | d935760524cd0b64c8117761e9bb22d6782680a8 (patch) | |
| tree | 0ac8e5b6f49cced4463b1eb853edcff8eda1d2a1 | |
| parent | 29721d11813a97918242c08238c97b1dd9708740 (diff) | |
proto/vjoy: for MSVC C++ linkage is used
Reported-by: @DaMichel
Issue: #381
| -rw-r--r-- | proto-vjoy/ftnoir_protocol_vjoy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/proto-vjoy/ftnoir_protocol_vjoy.h b/proto-vjoy/ftnoir_protocol_vjoy.h index 949eeb92..603b25d2 100644 --- a/proto-vjoy/ftnoir_protocol_vjoy.h +++ b/proto-vjoy/ftnoir_protocol_vjoy.h @@ -79,13 +79,13 @@ typedef struct _JOYSTICK_STATE UINT32 Buttons; // 32 Buttons } JOYSTICK_STATE, * PJOYSTICK_STATE; -#define VJOY_API extern "C" __declspec(dllimport) - #ifndef _MSC_VER +#define VJOY_API extern "C" __declspec(dllimport) VJOY_API BOOL __stdcall VJoy_Initialize(PCHAR name, PCHAR serial); VJOY_API VOID __stdcall VJoy_Shutdown(); VJOY_API BOOL __stdcall VJoy_UpdateJoyState(int id, PJOYSTICK_STATE pJoyState); #else +#define VJOY_API __declspec(dllimport) VJOY_API BOOL __stdcall VJoy_Initialize(PCHAR name, PCHAR serial); VJOY_API VOID __stdcall VJoy_Shutdown(); VJOY_API BOOL __stdcall VJoy_UpdateJoyState(int id, PJOYSTICK_STATE pJoyState); |