Always defined WIN32_LEAN_AND_MEAN.

Might as well, less mess everywhere else.

Common/CommonWindows.h

@@ -1,6 +1,9 @@
 #pragma once
 
 #ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif

Common/Hash.cpp

@@ -22,12 +22,6 @@
 #include <nmmintrin.h>
 #endif
 
-#ifdef _WIN32
-// Windows defines min/max which conflict with std::min/std::max.
-#undef min
-#undef max
-#endif
-
 static u64 (*ptrHashFunction)(const u8 *src, int len, u32 samples) = &GetMurmurHash3;
 
 // uint32_t

Common/StdMutex.h

@@ -16,7 +16,6 @@
 #include <algorithm>
 
 #if defined(_WIN32) // WIN32
-#define WIN32_LEAN_AND_MEAN
 #include "CommonWindows.h"
 #else // POSIX
 #include <pthread.h>

Common/StdThread.h

@@ -28,7 +28,6 @@
 #if defined(_WIN32)
 // WIN32
 
-#define WIN32_LEAN_AND_MEAN
 #include "CommonWindows.h"
 
 #if defined(_MSC_VER) && defined(_MT)

Core/HLE/sceDisplay.cpp

@@ -46,12 +46,6 @@
 #include "../../GPU/GPUState.h"
 #include "../../GPU/GPUInterface.h"
 
-#ifdef _WIN32
-// Windows defines min/max which conflict with std::min/std::max.
-#undef min
-#undef max
-#endif
-
 struct FrameBufferState {
 	u32 topaddr;
 	PspDisplayPixelFormat pspFramebufFormat;

Core/HLE/sceKernelTime.cpp

@@ -16,7 +16,6 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
 #include "Common/CommonWindows.h"
 #else
 #include <sys/time.h>

Core/HLE/sceRtc.cpp

@@ -17,6 +17,7 @@
 
 #ifdef _WIN32
 #include "Common/CommonWindows.h"
+#include <Winsock2.h>
 #else
 #include <sys/time.h>
 #endif

Core/MIPS/MIPSIntVFPU.cpp

@@ -1493,8 +1493,6 @@ namespace MIPSInt
 		PC += 4;
 	}
 
-#undef max
-
 	void Int_Vcst(u32 op)
 	{
 		int conNum = (op >> 16) & 0x1f;

Core/System.cpp

@@ -16,8 +16,6 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #ifdef _WIN32
-#define NOMINMAX
-#define WIN32_LEAN_AND_MEAN
 #include "Common/CommonWindows.h"
 #endif
 

GPU/GLES/IndexGenerator.h

@@ -21,7 +21,6 @@
 #include <algorithm>
 #include "CommonTypes.h"
 #include "../ge_constants.h"
-#undef max
 
 class IndexGenerator
 {

GPU/GLES/ShaderManager.cpp

@@ -20,7 +20,6 @@
 #endif
 
 #ifdef SHADERLOG
-#define WIN32_LEAN_AND_MEAN
 #include "Common/CommonWindows.h"
 #endif
 

Windows/Debugger/CtrlDisAsmView.h

@@ -20,12 +20,10 @@
 
 #include "../../Core/Debugger/DebugInterface.h"
 
-#include <windows.h>
+#include "Common/CommonWindows.h"
 #include <vector>
 #include <algorithm>
 
-#undef min
-#undef max
 using std::min;
 using std::max;
 

Windows/DinputDevice.cpp

@@ -24,7 +24,7 @@
 #include "Core/Config.h"
 #include "input/input_state.h"
 #include "base/NativeApp.h"
-#include"input/keycodes.h"
+#include "input/keycodes.h"
 #include "Core/Reporting.h"
 #include "Xinput.h"
 #pragma comment(lib,"dinput8.lib")

Windows/OpenGLBase.h

@@ -2,8 +2,7 @@
 
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include "Common/CommonWindows.h"
 
 bool GL_Init(HWND window, std::string *error_message);