[Bf-blender-cvs] [94722121e57] blender2.8: Fix MSVC compilation error in a less hacky way

Clément Foucault noreply at git.blender.org
Thu Jul 19 17:21:25 CEST 2018


Commit: 94722121e572bc8ac4863ae7cdaf26386695202d
Author: Clément Foucault
Date:   Thu Jul 19 17:20:48 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB94722121e572bc8ac4863ae7cdaf26386695202d

Fix MSVC compilation error in a less hacky way

===================================================================

M	source/blender/windowmanager/intern/wm_init_exit.c

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 7643086e30a..c51d4c5534a 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -35,8 +35,8 @@
 #include <string.h>
 
 #ifdef _WIN32
+#  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
-#  undef interface /* fix conflict with GPU_batch.h */
 #endif
 
 #include "MEM_guardedalloc.h"



More information about the Bf-blender-cvs mailing list