From d935760524cd0b64c8117761e9bb22d6782680a8 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 8 Jul 2016 14:32:52 +0200 Subject: proto/vjoy: for MSVC C++ linkage is used Reported-by: @DaMichel Issue: #381 --- proto-vjoy/ftnoir_protocol_vjoy.h | 4 ++-- 1 file 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); -- cgit v1.2.3