From a00c552055ebd326c4a0bccb3d7d6eaa66777721 Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Fri, 7 Jun 2013 16:21:20 +0000 Subject: [PATCH] Fixed problem with DLL definitions on Windows; was getting unresolved symbols on Windows --- motorApp/NewportSrc/hxp_drivers.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/motorApp/NewportSrc/hxp_drivers.h b/motorApp/NewportSrc/hxp_drivers.h index 8c21de28..45c6bc22 100644 --- a/motorApp/NewportSrc/hxp_drivers.h +++ b/motorApp/NewportSrc/hxp_drivers.h @@ -6,12 +6,16 @@ *************************************************/ #ifdef _WIN32 - #ifndef DLL - #define DLL _declspec(dllimport) - #endif + #ifndef DLL + #ifdef _DLL /* _DLL is defined by EPICS if we are being compiled to call DLLs */ + #define DLL _declspec(dllimport) + #else + #define DLL + #endif + #endif #else - #define DLL - #define __stdcall + #define DLL + #define __stdcall #endif #ifdef __cplusplus extern "C"