diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-03-18 19:38:37 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-03-18 19:38:37 +0300 |
| commit | b88ca3e6d113d161dd119bf1cec959c73b797af7 (patch) | |
| tree | 6a8b73ca95f8a21742cba1e764d1e24cc5ae8db5 /source/blender/blenlib | |
| parent | 9e382dd2a3d8569201a3e5c1a8478166c77e9029 (diff) | |
Cleanup: Resolve HKEY conflict
Both the MS headers and blender headers define the HKEY
which gives all kind of inclusion order issues.
This diff renames all *KEY constants to EVT_*KEY to resolve
this conflict.
Reviewed By: brecht , dfelinto
Differential Revision: http://developer.blender.org/D7164
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_winstuff.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h index 67b15af321a..4666151f84a 100644 --- a/source/blender/blenlib/BLI_winstuff.h +++ b/source/blender/blenlib/BLI_winstuff.h @@ -31,14 +31,7 @@ #define WIN32_LEAN_AND_MEAN -#ifndef WIN32_SKIP_HKEY_PROTECTION -# undef HKEY -# define HKEY WIN32_HKEY /* prevent competing definitions */ -# include <windows.h> -# undef HKEY -#else -# include <windows.h> -#endif +#include <windows.h> #undef near #undef far |