Mesa (master): nir: fix (hopefully) windows build

Rob Clark robclark at kemper.freedesktop.org
Mon May 8 17:43:16 UTC 2017


Module: Mesa
Branch: master
Commit: ae7aa8dbaf7c65a8b0d86713530a751b7d2f10b0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ae7aa8dbaf7c65a8b0d86713530a751b7d2f10b0

Author: Rob Clark <robdclark at gmail.com>
Date:   Mon May  8 13:34:53 2017 -0400

nir: fix (hopefully) windows build

Fixes: 53aa109b ("nir: add pass to lower atomic counters to SSBO")
Signed-off-by: Rob Clark <robdclark at gmail.com>

---

 src/compiler/nir/nir.h       | 4 ++++
 src/compiler/nir/nir_print.c | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index b6bc3fa7c2..2a9ab542f6 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -47,6 +47,10 @@
 
 #include "nir_opcodes.h"
 
+#if defined(_WIN32) && !defined(snprintf)
+#define snprintf _snprintf
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/compiler/nir/nir_print.c b/src/compiler/nir/nir_print.c
index e6c5c9c830..dfdb5f3619 100644
--- a/src/compiler/nir/nir_print.c
+++ b/src/compiler/nir/nir_print.c
@@ -31,10 +31,6 @@
 #include <stdlib.h>
 #include <inttypes.h> /* for PRIx64 macro */
 
-#if defined(_WIN32) && !defined(snprintf)
-#define snprintf _snprintf
-#endif
-
 static void
 print_tabs(unsigned num_tabs, FILE *fp)
 {




More information about the mesa-commit mailing list