diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2005-03-19 23:04:25 +0300 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2005-03-19 23:04:25 +0300 |
| commit | b3bb3f06baa3a591586660123c0d4f3bad79f527 (patch) | |
| tree | 9e8a49067a5083c0f52d3e3a010acdb306612bd1 /source/blender/blenlib/BLI_winstuff.h | |
| parent | c8d6515ad7bd6b5b5ac773dfad9812591851cf80 (diff) | |
Some cleaning up of BLI_winstuff.h usage
- removed reference in render.h (really bad, shouldn't include a platform
specific header so widely unless really necessary)
- added M_PI, M_PI_2, M_SQRT, M_SQRT_2 defines to BLI_arithb.h... this is
a better place as it is more the "standard" blender math header. left
in winstuff.h as well for the moment for simplicity
- other changes are patches to code so everything works ok with this
shuffling.
Diffstat (limited to 'source/blender/blenlib/BLI_winstuff.h')
| -rw-r--r-- | source/blender/blenlib/BLI_winstuff.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h index b9f92aedb98..d353c016751 100644 --- a/source/blender/blenlib/BLI_winstuff.h +++ b/source/blender/blenlib/BLI_winstuff.h @@ -34,7 +34,14 @@ #pragma warning(once: 4761 4305 4244 4018) #define WIN32_LEAN_AND_MEAN + +#ifndef WIN32_SKIP_HKEY_PROTECTION +#define HKEY WIN32_HKEY // prevent competing definitions +#include <windows.h> +#undef HKEY +#else #include <windows.h> +#endif #undef near #undef far @@ -55,10 +62,20 @@ #ifndef __WINSTUFF_H__ #define __WINSTUFF_H__ + // These definitions are also in arithb for simplicity + +#ifndef M_PI #define M_PI 3.14159265358979323846 +#endif +#ifndef M_PI_2 #define M_PI_2 1.57079632679489661923 +#endif +#ifndef M_SQRT2 #define M_SQRT2 1.41421356237309504880 +#endif +#ifndef M_SQRT1_2 #define M_SQRT1_2 0.70710678118654752440 +#endif #define MAXPATHLEN MAX_PATH |