summaryrefslogtreecommitdiffhomepage
path: root/proto-vjoy
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-07-08 11:46:26 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-07-08 11:46:26 +0200
commitd4f7dc3cf636741a7f28fb9e6ca8b3d626593576 (patch)
tree4e1eecbd85d224eb5c1ba19e29814124af62d535 /proto-vjoy
parentfb561a2ae234fa29ccdeaa2d413419aa1bd3188f (diff)
proto/vjoy: use correct linkage; fix MSVC
Submitted-by: @DaMichel Issue: #381
Diffstat (limited to 'proto-vjoy')
-rw-r--r--proto-vjoy/ftnoir_protocol_vjoy.h4
1 files changed, 2 insertions, 2 deletions
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);