MSVC: resolve near/far issue take2

Previous fix failed w/ compositor,
tested on MSVC2015, full build.

source/blender/makesdna/DNA_view3d_types.h

@@ -54,8 +54,12 @@ struct GPUFX;
 
 /* ******************************** */
 
-/* The near/far thing is a Win EXCEPTION. Thus, leave near/far in the
- * code, and patch for windows. */
+/* The near/far thing is a Win EXCEPTION, caused by indirect includes from <windows.h>.
+ * Thus, leave near/far in the code, and undef for windows. */
+#ifdef _WIN32
+#  undef near
+#  undef far
+#endif
 
 /* Background Picture in 3D-View */
 typedef struct BGpic {

source/blender/windowmanager/intern/wm_init_exit.c

@@ -34,10 +34,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #  include <windows.h>
-#  undef near
-#  undef far
 #endif
 
 #include "MEM_guardedalloc.h"