diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-09 11:02:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-09 11:02:33 +0300 |
| commit | a92557f77b46784bb2631981fbf9fd67468419d1 (patch) | |
| tree | c7c1e0610d6b76aac0db873cad78e54c3a8f7f3e /source/blender/windowmanager/intern/wm_init_exit.c | |
| parent | 2d2875fc158d2fbcade1d335f2ca3921cb65d87e (diff) | |
| parent | 598216c36e2461ddcaa7dd72e4d50691710c4647 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/intern/wm_init_exit.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 9017f21504d..b64b839d7b1 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -36,6 +36,8 @@ #ifdef WIN32 # include <windows.h> +# undef near +# undef far #endif #include "MEM_guardedalloc.h" |