diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-03-18 22:26:38 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-03-18 22:26:38 +0300 |
| commit | c102dfd43d5ce6b159112b66cb80d233620e58dc (patch) | |
| tree | 0b4aef812be0df16126f6300d8e724af5bbd55f7 /source/blender/imbuf/intern/anim_movie.c | |
| parent | 6bfe7c7a02bd27b155990efdd51d0984d9619ce9 (diff) | |
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.
Diffstat (limited to 'source/blender/imbuf/intern/anim_movie.c')
| -rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 7 |
1 files changed, 1 insertions, 6 deletions
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 */ |