From d4f7dc3cf636741a7f28fb9e6ca8b3d626593576 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 8 Jul 2016 11:46:26 +0200 Subject: proto/vjoy: use correct linkage; fix MSVC Submitted-by: @DaMichel Issue: #381 --- proto-vjoy/ftnoir_protocol_vjoy.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'proto-vjoy') diff --git a/proto-vjoy/ftnoir_protocol_vjoy.h b/proto-vjoy/ftnoir_protocol_vjoy.h index ab89d6e5..949eeb92 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" 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