Commit c6de808f authored by pacanows's avatar pacanows

Changing WIN32 to _WIN32

parent 9ca52a0d
...@@ -153,7 +153,7 @@ std::ostream& operator<<(std::ostream& out, const timer& t) ...@@ -153,7 +153,7 @@ std::ostream& operator<<(std::ostream& out, const timer& t)
unsigned int timer::current_time() const unsigned int timer::current_time() const
{ {
#ifdef WIN32 #ifdef _WIN32
SYSTEMTIME res; SYSTEMTIME res;
GetSystemTime(&res); GetSystemTime(&res);
return (unsigned int)(res.wSecond + res.wMinute*60 + res.wHour*360); return (unsigned int)(res.wSecond + res.wMinute*60 + res.wHour*360);
......
...@@ -256,7 +256,7 @@ template<typename T> T clamp(T x, T a, T b) ...@@ -256,7 +256,7 @@ template<typename T> T clamp(T x, T a, T b)
return std::max<T>(std::min<T>(x, b), a); return std::max<T>(std::min<T>(x, b), a);
} }
#ifdef WIN32 #ifdef _WIN32
#define NOT_IMPLEMENTED() \ #define NOT_IMPLEMENTED() \
std::cerr << "<<ERROR>> not implemented " << __FUNCDNAME__ << " in file " << __FILE__ \ std::cerr << "<<ERROR>> not implemented " << __FUNCDNAME__ << " in file " << __FILE__ \
<< ":" << __LINE__ << std::endl; \ << ":" << __LINE__ << std::endl; \
...@@ -269,7 +269,7 @@ throw ...@@ -269,7 +269,7 @@ throw
#endif #endif
// Mathematical definition not provided on the Window plateform // Mathematical definition not provided on the Window plateform
#ifdef WIN32 #ifdef _WIN32
#define M_PI 3.14159265 #define M_PI 3.14159265
template<typename T> bool isnan(T x) template<typename T> bool isnan(T x)
...@@ -278,7 +278,7 @@ template<typename T> bool isnan(T x) ...@@ -278,7 +278,7 @@ template<typename T> bool isnan(T x)
} }
#endif #endif
#ifdef WIN32 #ifdef _WIN32
#define ALTA_DLL_EXPORT extern "C" __declspec(dllexport) #define ALTA_DLL_EXPORT extern "C" __declspec(dllexport)
#else #else
#define ALTA_DLL_EXPORT extern "C" #define ALTA_DLL_EXPORT extern "C"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <QDir> #include <QDir>
*/ */
#ifdef WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#else #else
#include <dlfcn.h> #include <dlfcn.h>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
//! specific type. //! specific type.
template<typename T> T open_library(const std::string& filename, const char* function) template<typename T> T open_library(const std::string& filename, const char* function)
{ {
#ifdef WIN32 #ifdef _WIN32
HINSTANCE handle = LoadLibraryA(filename.c_str()); HINSTANCE handle = LoadLibraryA(filename.c_str());
if(handle != NULL) if(handle != NULL)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment