X-Git-Url: http://git.smho.de/gw/?p=owTools.git;a=blobdiff_plain;f=src%2FowInterface.h;h=0370d032887b48b4a9d6fe00959ba4b4e6faba2d;hp=952f3dce3778025964cb79c3b6f1677655ea1996;hb=1a6465a924428af072a8eb5e75ee547c394f4d8e;hpb=039b202e5c68834801d23e22eecc7cae2879ea83 diff --git a/src/owInterface.h b/src/owInterface.h index 952f3dc..0370d03 100755 --- a/src/owInterface.h +++ b/src/owInterface.h @@ -34,12 +34,28 @@ #ifndef __OWINTERFACES_H_ #define __OWINTERFACES_H_ +#if defined(WIN) || defined(LINUX) +#else +#if defined(_WINDOWS) || defined(__WINDOWS__) || defined(_WIN32) || defined(WIN32) +#define WIN +#else +#define LINUX +#endif +#endif + + #include #include #include +#ifdef LINUX #include +#endif #include +#ifdef WIN +#include + +#endif class owDevice; class owDeviceConfig; @@ -48,7 +64,7 @@ class owDeviceConfig; #if defined(_WINDOWS) || defined(__WINDOWS__) || defined(_WIN32) || defined(WIN32) #define USE_WINDOWS_TIME 1 #include - #include "win32/usb.h" // libusb header + //#include "win32/usb.h" // libusb header #else #define USE_WINDOWS_TIME 0 #include @@ -84,7 +100,12 @@ public: va_list arg; int done; va_start (arg, format); +#ifdef LINUX done = vsprintf (s, format, arg); +#endif +#ifdef WIN + done = vsprintf_s(s,300, format, arg); +#endif va_end (arg); logtext=s; level=llevel;