diff options
Diffstat (limited to 'source/blender/makesdna/DNA_view3d_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 10 |
1 files changed, 7 insertions, 3 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; |