From 6ee8175f372f00ea62e3b2efeafc5f990780e252 Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Thu, 6 Apr 2006 23:59:24 +0000 Subject: [PATCH] XPS firmware version 1.5.1 and asyn changes --- motorApp/NewportSrc/XPS_C8_drivers.cpp | 7 ++++++- motorApp/NewportSrc/XPS_C8_drivers.h | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/motorApp/NewportSrc/XPS_C8_drivers.cpp b/motorApp/NewportSrc/XPS_C8_drivers.cpp index af0add9c..884f7bae 100644 --- a/motorApp/NewportSrc/XPS_C8_drivers.cpp +++ b/motorApp/NewportSrc/XPS_C8_drivers.cpp @@ -6,8 +6,13 @@ #include #include #include -#include "socket.h" +#include +#include "Socket.h" +#ifdef _WIN32 #define DLL _declspec(dllexport) +#else +#define DLL +#endif #include "XPS_C8_drivers.h" diff --git a/motorApp/NewportSrc/XPS_C8_drivers.h b/motorApp/NewportSrc/XPS_C8_drivers.h index 4af40d30..df452845 100644 --- a/motorApp/NewportSrc/XPS_C8_drivers.h +++ b/motorApp/NewportSrc/XPS_C8_drivers.h @@ -3,10 +3,14 @@ // +#ifdef _WIN32 #ifndef DLL #define DLL _declspec(dllimport) #endif - +#else +#define DLL +#define __stdcall +#endif #ifdef __cplusplus