Commit b1db2e32 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Merge branch 'develop' of https://git.rwth-aachen.de/ita/ITABase into develop

parents a1dab7bf fcc074b5
...@@ -21,14 +21,10 @@ ...@@ -21,14 +21,10 @@
#include <ITABaseDefinitions.h> #include <ITABaseDefinitions.h>
<<<<<<< HEAD
=======
>>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <string> #include <string>
#ifdef WIN32 #ifdef WIN32
#ifndef _WIN32_WINNT // @todo: remove #ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500 #define _WIN32_WINNT 0x0501
#endif #endif
#include <windows.h> #include <windows.h>
#else #else
......
...@@ -21,13 +21,10 @@ ...@@ -21,13 +21,10 @@
#include <ITAUncopyable.h> #include <ITAUncopyable.h>
<<<<<<< HEAD
#ifndef _WIN32_WINNT // @todo: remove #ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500 #define _WIN32_WINNT 0x0501
#endif #endif
=======
>>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <windows.h> #include <windows.h>
/** /**
......
...@@ -32,14 +32,11 @@ ...@@ -32,14 +32,11 @@
#include <Windows.h> #include <Windows.h>
#endif #endif
<<<<<<< HEAD
// Weitere Includes // Weitere Includes
#ifndef _WIN32_WINNT // @todo: remove #ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500 #define _WIN32_WINNT 0x0501
#endif #endif
=======
>>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
// Vorwrtsdeklarationen // Vorwrtsdeklarationen
class ITATimer; class ITATimer;
......
#include <ITAAtomicOps.h> #include <ITAAtomicOps.h>
<<<<<<< HEAD
#ifndef _WIN32_WINNT // @todo: remove #ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500 #define _WIN32_WINNT 0x0501
#endif #endif
=======
>>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <windows.h> #include <windows.h>
typedef union typedef union
......
...@@ -3,12 +3,9 @@ ...@@ -3,12 +3,9 @@
#include "ITACriticalSectionImpl.h" #include "ITACriticalSectionImpl.h"
<<<<<<< HEAD
#ifndef _WIN32_WINNT // @todo: remove #ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500 #define _WIN32_WINNT 0x0501
#endif #endif
=======
>>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <windows.h> #include <windows.h>
class ITACriticalSectionWin32Impl : public ITACriticalSectionImpl class ITACriticalSectionWin32Impl : public ITACriticalSectionImpl
......
...@@ -12,12 +12,9 @@ ...@@ -12,12 +12,9 @@
#include <cmath> #include <cmath>
<<<<<<< HEAD
#ifndef _WIN32_WINNT // @todo: remove #ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500 #define _WIN32_WINNT 0x0501
#endif #endif
=======
>>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <windows.h> #include <windows.h>
#include "ITAException.h" #include "ITAException.h"
......
...@@ -4,12 +4,9 @@ ...@@ -4,12 +4,9 @@
#include <ITAException.h> #include <ITAException.h>
<<<<<<< HEAD
#ifndef _WIN32_WINNT // @todo: remove #ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500 #define _WIN32_WINNT 0x0501
#endif #endif
=======
>>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <windows.h> #include <windows.h>
ITAWinPCClock* ITAWinPCClock::m_pInstance = NULL; ITAWinPCClock* ITAWinPCClock::m_pInstance = NULL;
......
Supports Markdown
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