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.
This commit is contained in:
parent
6bfe7c7a02
commit
c102dfd43d
@ -33,8 +33,6 @@
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
#undef near
|
||||
#undef far
|
||||
#undef rad
|
||||
#undef rad1
|
||||
#undef rad2
|
||||
|
@ -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 */
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user