From 9c5bec0292d23efb626260027ed826831faefc83 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Wed, 15 May 2019 09:13:07 -0600 Subject: space_file: fix build error with msvc. Both windows.h and wm_types.h define HKEY, moving wm_types after windows.h sidesteps the issue, since HKEY isn't used in fsmenu.c it doesn't cause problems. --- source/blender/editors/space_file/fsmenu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/space_file') diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index 25187d56d7e..208ba73b8a6 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -35,9 +35,6 @@ #include "ED_fileselect.h" -#include "WM_api.h" -#include "WM_types.h" - #ifdef WIN32 /* Need to include windows.h so _WIN32_IE is defined. */ # include @@ -47,6 +44,10 @@ # include "BLI_winstuff.h" #endif +#include "WM_api.h" +#include "WM_types.h" + + #ifdef __APPLE__ # include #endif /* __APPLE__ */ -- cgit v1.2.3