xrCore: fix define conditions

OpenXRay · Sep 22, 2018 · 5504fe1 · 5504fe1
1 parent 966a40b
commit 5504fe1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/xrCore/Math/MathUtil.cpp b/src/xrCore/Math/MathUtil.cpp
@@ -13,7 +13,7 @@
 #include "Layers/xrRender/light.h"
 #endif
 #include "PLC_SSE.hpp"
-#if defined(WINDOWS) and defined(XR_X86)
+#if defined(WINDOWS) && defined(XR_X86)
 #include "SkinXW_SSE.hpp"
 #else
 #include "SkinXW_CPP.hpp"
@@ -39,7 +39,7 @@ void Initialize()
     static bool initialized = false;
     if (initialized)
         return;
-#if defined(WINDOWS) and defined(XR_X86)
+#if defined(WINDOWS) && defined(XR_X86)
     Skin1W = Skin1W_SSE;
     Skin2W = Skin2W_SSE;
     Skin3W = Skin3W_SSE;

diff --git a/src/xrCore/Math/SkinXW_SSE.cpp b/src/xrCore/Math/SkinXW_SSE.cpp
@@ -12,7 +12,7 @@ namespace XRay
 {
 namespace Math
 {
-#if defined(WINDOWS) and defined(XR_X86)
+#if defined(WINDOWS) && defined(XR_X86)
 #define transform_dir(idx, res, SX, SY, SZ, T1) \
     \
 __asm movzx eax,                                \

diff --git a/src/xrCore/Math/SkinXW_SSE.hpp b/src/xrCore/Math/SkinXW_SSE.hpp
@@ -12,7 +12,7 @@ namespace XRay
 {
 namespace Math
 {
-#if defined(WINDOWS) and defined(XR_X86)
+#if defined(WINDOWS) && defined(XR_X86)
 void Skin1W_SSE(vertRender* D, vertBoned1W* S, u32 vCount, CBoneInstance* Bones);
 void Skin2W_SSE(vertRender* D, vertBoned2W* S, u32 vCount, CBoneInstance* Bones);
 void Skin3W_SSE(vertRender* D, vertBoned3W* S, u32 vCount, CBoneInstance* Bones);