diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-09 12:20:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-09 12:23:32 +0300 |
| commit | b59b8124001182a40bf4aa271591d589b2d46cfa (patch) | |
| tree | 68f622f2f5260e2902593a1fe5a4eaa267499d1d /source | |
| parent | 598216c36e2461ddcaa7dd72e4d50691710c4647 (diff) | |
MSVC: resolve near/far issue take2
Previous fix failed w/ compositor,
tested on MSVC2015, full build.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 10 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 5169657206c..6f3cf4e2bec 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -54,9 +54,13 @@ struct GPUFX; /* ******************************** */ -/* The near/far thing is a Win EXCEPTION. Thus, leave near/far in the - * code, and patch for windows. */ - +/* The near/far thing is a Win EXCEPTION, caused by indirect includes from <windows.h>. + * Thus, leave near/far in the code, and undef for windows. */ +#ifdef _WIN32 +# undef near +# undef far +#endif + /* Background Picture in 3D-View */ typedef struct BGpic { struct BGpic *next, *prev; diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 912809c7ab9..f05d8b0a90e 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -34,10 +34,8 @@ #include <stdio.h> #include <string.h> -#ifdef WIN32 +#ifdef _WIN32 # include <windows.h> -# undef near -# undef far #endif #include "MEM_guardedalloc.h" |