diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-09 11:00:55 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-09 11:00:55 +0300 |
| commit | 598216c36e2461ddcaa7dd72e4d50691710c4647 (patch) | |
| tree | 79a2b3e963a75f66b5ff104635f6ea328d5276b8 /source/blender | |
| parent | 80844fdfc04e5711bd3b1e1453c09551ee8897c7 (diff) | |
MSVC: remove hack for near/far name collision
windows headers define these, conflicting w/ View3D.near/far.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 9 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index b9894d46b5b..5169657206c 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -46,15 +46,6 @@ struct wmTimer; struct Material; struct GPUFX; -/* This is needed to not let VC choke on near and far... old - * proprietary MS extensions... */ -#ifdef WIN32 -#undef near -#undef far -#define near clipsta -#define far clipend -#endif - #include "DNA_defs.h" #include "DNA_listBase.h" #include "DNA_image_types.h" diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 52682523212..912809c7ab9 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" |