[Bf-blender-cvs] [c102dfd43d5] master: Cleanup: Prepare for sorted headers on windows

Ray Molenkamp noreply at git.blender.org
Wed Mar 18 20:26:43 CET 2020


Commit: c102dfd43d5ce6b159112b66cb80d233620e58dc
Author: Ray Molenkamp
Date:   Wed Mar 18 13:26:38 2020 -0600
Branches: master
https://developer.blender.org/rBc102dfd43d5ce6b159112b66cb80d233620e58dc

Cleanup: Prepare for sorted headers on windows

To prepare for D6811 small changes were needed.
we can no longer undefine near/far since the windows
headers use those extensively.

some of the imbuf files need to include the windows
headers explicitly to make sure it builds.

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

M	source/blender/blenlib/BLI_winstuff.h
M	source/blender/imbuf/intern/anim_movie.c
M	source/blender/imbuf/intern/indexer.c
M	source/blender/imbuf/intern/util.c

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

diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h
index 08d29a328b4..3d59ad21251 100644
--- a/source/blender/blenlib/BLI_winstuff.h
+++ b/source/blender/blenlib/BLI_winstuff.h
@@ -33,8 +33,6 @@
 
 #include <windows.h>
 
-#undef near
-#undef far
 #undef rad
 #undef rad1
 #undef rad2
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index 232a9998ebf..6a5a97e24e4 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -22,12 +22,7 @@
  */
 
 #ifdef _WIN32
-#  define INC_OLE2
-#  include <windows.h>
-#  include <windowsx.h>
-#  include <mmsystem.h>
-#  include <memory.h>
-#  include <commdlg.h>
+#  include "BLI_winstuff.h"
 #  include <vfw.h>
 
 #  undef AVIIF_KEYFRAME /* redefined in AVI_avi.h */
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
index 46095b7eedc..6589b784ec0 100644
--- a/source/blender/imbuf/intern/indexer.c
+++ b/source/blender/imbuf/intern/indexer.c
@@ -30,6 +30,9 @@
 #include "BLI_string.h"
 #include "BLI_fileops.h"
 #include "BLI_ghash.h"
+#ifdef _WIN32
+#  include "BLI_winstuff.h"
+#endif
 
 #include "IMB_indexer.h"
 #include "IMB_anim.h"
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c
index 27b566e25a2..a8aabf384c8 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -31,6 +31,9 @@
 #include "BLI_utildefines.h"
 #include "BLI_path_util.h"
 #include "BLI_fileops.h"
+#ifdef _WIN32
+#  include "BLI_winstuff.h"
+#endif
 
 #include "imbuf.h"
 #include "IMB_imbuf_types.h"



More information about the Bf-blender-cvs mailing list