xrCore: fix build after merge

Author: eagleivg

src/xrCore/LocatorAPI.h

@@ -2,18 +2,21 @@
 
 #pragma warning(push)
 #pragma warning(disable : 4995)
-#ifdef WINDOWS
+#if defined(WINDOWS)
 #include <io.h>
-#else // WINDOWS
-#include <inttypes.h>
-#include <sys/types.h> /* To get time_t. */
-
-#define _A_HIDDEN 0x02
-#define _A_SUBDIR 0x10
-
-#ifndef FILENAME_MAX
-#define FILENAME_MAX (260)
 #endif
+#pragma warning(pop)
+#include "Common/Util.hpp"
+#include "LocatorAPI_defs.h"
+//#include "xrCore/Threading/Lock.hpp"
+#include "xrCommon/xr_map.h"
+#include "xrCommon/predicates.h"
+#include "Common/Noncopyable.hpp"
+
+#if defined(LINUX)
+#include <stdint.h>
+#define _A_HIDDEN      0x02
+#define _A_SUBDIR 0x00000010
 
 #ifdef XR_X64
 #define _finddata_t _finddata64i32_t
@@ -45,15 +48,8 @@ struct _finddata32_t
     char name[FILENAME_MAX];
 };
 
-#endif // WINDOWS
-#pragma warning(pop)
-
-#include "Common/Util.hpp"
-#include "LocatorAPI_defs.h"
-//#include "xrCore/Threading/Lock.hpp"
-#include "xrCommon/xr_map.h"
-#include "xrCommon/predicates.h"
-#include "Common/Noncopyable.hpp"
+#define _finddata_t     _finddata64i32_t
+#endif
 
 class CStreamReader;
 class Lock;

src/xrCore/Threading/Event.hpp

@@ -3,16 +3,14 @@
 
 class XRCORE_API Event
 {
-#if defined(WINDOWS)
     void* handle;
-#elif defined(LINUX)
+#if defined(LINUX)
     struct EventHandle
     {
         pthread_mutex_t mutex;
         pthread_cond_t cond;
         bool signaled;
     };
-    pthread_mutex_t handle;
 
 private:
     EventHandle m_id;

src/xrCore/XML/XMLDocument.hpp

@@ -8,7 +8,9 @@
 #define PUGIXML_NO_XPATH
 #define PUGIXML_HAS_LONG_LONG
 #include "pugixml.hpp"
+#ifdef DEBUG // debug & mixed
 #include "xrCommon/xr_vector.h"
+#endif
 #include "xrCore/xrstring.h"
 
 static constexpr pcstr CONFIG_PATH = "$game_config$";

src/xrCore/_obb.h

@@ -120,7 +120,7 @@ struct _obb
         Tvector kDirection;
         kDirection.set(dir.dotproduct(m_rotate.i), dir.dotproduct(m_rotate.j), dir.dotproduct(m_rotate.k));
 
-        T fT0 = 0.0f, fT1 = type_max(T);
+        T fT0 = 0.0f, fT1 = type_max<T>;
         if (intersect(kOrigin, kDirection, m_halfsize, fT0, fT1))
         {
             bool bPick = false;