From 598216c36e2461ddcaa7dd72e4d50691710c4647 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 9 May 2018 10:00:55 +0200 Subject: MSVC: remove hack for near/far name collision windows headers define these, conflicting w/ View3D.near/far. --- source/blender/makesdna/DNA_view3d_types.h | 9 --------- source/blender/windowmanager/intern/wm_init_exit.c | 2 ++ 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'source') 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 +# undef near +# undef far #endif #include "MEM_guardedalloc.h" -- cgit v1.2.3