Series LGTM. Reviewed-by: Brian Paul <bri...@vmware.com>
On 12/03/2014 08:37 AM, Jose Fonseca wrote:
From: José Fonseca <jfons...@vmware.com>
And not just MSVC.
Fixes build with MinGW.
---
tests/util/piglit-util.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/util/piglit-util.h b/tests/util/piglit-util.h
index af5d9fd..90d57d3 100755
--- a/tests/util/piglit-util.h
+++ b/tests/util/piglit-util.h
@@ -32,7 +32,13 @@ extern "C" {
#include "config.h"
#if defined(_WIN32)
+
#include <windows.h>
+
+/* Another two macros provided by windows.h which conflict with piglit */
+#undef near
+#undef far
+
#endif
#include <assert.h>
@@ -54,10 +60,6 @@ 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
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
