diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-09 12:25:35 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-09 12:25:35 +0300 |
commit | 0d4b165d4f2091708a086bffd5f5223e7135af11 (patch) | |
tree | d58807b47dfd354b9dcb00d7cd39bafb94a2ef74 /source/blender/windowmanager | |
parent | 1cbe3b6e0388b27c7866fd1e97230551ec4032f1 (diff) | |
parent | b59b8124001182a40bf4aa271591d589b2d46cfa (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index b64b839d7b1..5813fc95e13 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" |