From 8c8761b237d35d1a39ec9535e69d6aaa97b99c84 Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon, 20 Mar 2017 16:04:19 +0000
Subject: [PATCH] i965: consistently use ifndef guards over pragma once
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The only remaining case is the brw_oa.py generator which pipes the
generated file to stdout. That will be resolved with later commits.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Vedran Miletić <vedran@miletic.net>
Acked-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
---
 src/mesa/drivers/dri/i965/brw_blorp.h             | 5 ++++-
 src/mesa/drivers/dri/i965/brw_multisample_state.h | 5 +++++
 src/mesa/drivers/dri/i965/brw_performance_query.h | 4 +++-
 src/mesa/drivers/dri/i965/intel_resolve_map.h     | 4 +++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/i965/brw_blorp.h
index 277b00ebc2e..ee4bf3bf541 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.h
+++ b/src/mesa/drivers/dri/i965/brw_blorp.h
@@ -21,7 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#pragma once
+#ifndef BRW_BLORP_H
+#define BRW_BLORP_H
 
 #include "blorp/blorp.h"
 #include "intel_mipmap_tree.h"
@@ -85,3 +86,5 @@ void gen9_blorp_exec(struct blorp_batch *batch,
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
+
+#endif /* BRW_BLORP_H */
diff --git a/src/mesa/drivers/dri/i965/brw_multisample_state.h b/src/mesa/drivers/dri/i965/brw_multisample_state.h
index db59af2affb..6cf324e561c 100644
--- a/src/mesa/drivers/dri/i965/brw_multisample_state.h
+++ b/src/mesa/drivers/dri/i965/brw_multisample_state.h
@@ -21,6 +21,9 @@
  * IN THE SOFTWARE.
  */
 
+#ifndef BRW_MULTISAMPLE_STATE_H
+#define BRW_MULTISAMPLE_STATE_H
+
 #include <stdint.h>
 
 /**
@@ -104,3 +107,5 @@ static const uint32_t
 brw_multisample_positions_16x[] = {
    0xc75a7599, 0xb3dbad36, 0x2c42816e, 0x10eff408
 };
+
+#endif /* BRW_MULTISAMPLE_STATE_H */
diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.h b/src/mesa/drivers/dri/i965/brw_performance_query.h
index c9454f98eab..11938b74df3 100644
--- a/src/mesa/drivers/dri/i965/brw_performance_query.h
+++ b/src/mesa/drivers/dri/i965/brw_performance_query.h
@@ -21,7 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#pragma once
+#ifndef BRW_PERFORMANCE_QUERY_H
+#define BRW_PERFORMANCE_QUERY_H
 
 #include <stdint.h>
 
@@ -55,3 +56,4 @@ struct brw_perf_query_counter
    };
 };
 
+#endif /* BRW_PERFORMANCE_QUERY_H */
diff --git a/src/mesa/drivers/dri/i965/intel_resolve_map.h b/src/mesa/drivers/dri/i965/intel_resolve_map.h
index 397860c4d9a..17d3983f5e5 100644
--- a/src/mesa/drivers/dri/i965/intel_resolve_map.h
+++ b/src/mesa/drivers/dri/i965/intel_resolve_map.h
@@ -21,7 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#pragma once
+#ifndef INTEL_RESLVE_MAP_H
+#define INTEL_RESLVE_MAP_H
 
 #include <stdint.h>
 #include "blorp/blorp.h"
@@ -164,3 +165,4 @@ intel_resolve_map_clear(struct exec_list *resolve_map);
 } /* extern "C" */
 #endif
 
+#endif /* INTEL_RESLVE_MAP_H */
-- 
2.30.2