diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-11-21 20:08:53 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-12-03 13:04:56 +0000 |
| commit | 9b01c8130381d839c1596b4e2520b65f43d62963 (patch) | |
| tree | 4dd1399900f7c07084f43ca530a3c35c3a3190af /tests/util/piglit-util.h | |
| parent | 632ba8521515b973396959c879a351e9788e14a4 (diff) | |
util: move windows macro redefinitions into a single place
Move the final two windows specific #undef next to their min/max
brothers. Note that they seem to be defined when building with MSVC
(_MSV_VER) rather than all windows platfroms (_WIN32).
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'tests/util/piglit-util.h')
| -rwxr-xr-x | tests/util/piglit-util.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/util/piglit-util.h b/tests/util/piglit-util.h index 9731c1ca5..4c750aaf9 100755 --- a/tests/util/piglit-util.h +++ b/tests/util/piglit-util.h @@ -54,6 +54,10 @@ extern "C" { #undef max #undef min +/* Another two macros provided by windows.h which conflict with piglit */ +#undef near +#undef far + #if !defined(__cplusplus) && !defined(inline) #define inline __inline #endif |