aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/stdafx.h
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.Client/stdafx.h')
-rw-r--r--Minecraft.Client/stdafx.h34
1 files changed, 17 insertions, 17 deletions
diff --git a/Minecraft.Client/stdafx.h b/Minecraft.Client/stdafx.h
index 87a42bec..04a18b13 100644
--- a/Minecraft.Client/stdafx.h
+++ b/Minecraft.Client/stdafx.h
@@ -20,6 +20,23 @@
// #endif
// #endif
+#ifdef _WINDOWS64
+#define _HAS_STD_BYTE 0 // solve (std::)'byte' ambiguity with windows headers
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+// Windows Header Files:
+#include <malloc.h>
+#include <tchar.h>
+#include <windows.h>
+#include <windowsx.h>
+// TODO: reference additional headers your program requires here
+#include <DirectXMath.h>
+#include <d3d11.h>
+using namespace DirectX;
+
+#define HRESULT_SUCCEEDED(hr) (((HRESULT)(hr)) >= 0)
+
+#endif
+
#ifdef __PS3__
#include "Ps3Types.h"
@@ -59,23 +76,6 @@
#include <vector>
#endif
-#ifdef _WINDOWS64
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
-#include <windows.h>
-#include <windowsx.h>
-#include <malloc.h>
-#include <tchar.h>
-// TODO: reference additional headers your program requires here
-#include <d3d11.h>
-#include <DirectXMath.h>
-using namespace DirectX;
-
-#define HRESULT_SUCCEEDED(hr) (((HRESULT)(hr)) >= 0)
-
-#endif
-
-
#ifdef _DURANGO
#include <xdk.h>