From 3a98bffa5924d5e7d078268cfe5a42c9f58f0470 Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.velikov@collabora.com>
Date: Tue, 11 Oct 2016 18:26:20 +0100
Subject: [PATCH] isl: use ifndef header guards

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Chad Versace <chadversary@chromium.org>
---
 src/intel/isl/isl.h      | 5 ++++-
 src/intel/isl/isl_gen4.h | 5 ++++-
 src/intel/isl/isl_gen6.h | 5 ++++-
 src/intel/isl/isl_gen7.h | 5 ++++-
 src/intel/isl/isl_gen8.h | 5 ++++-
 src/intel/isl/isl_gen9.h | 5 ++++-
 src/intel/isl/isl_priv.h | 5 ++++-
 7 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
index 2edcdd1..11ad891 100644
--- a/src/intel/isl/isl.h
+++ b/src/intel/isl/isl.h
@@ -35,7 +35,8 @@
  *    - functions
  */
 
-#pragma once
+#ifndef ISL_H
+#define ISL_H
 
 #include <assert.h>
 #include <stdbool.h>
@@ -1477,3 +1478,5 @@ isl_surf_get_depth_format(const struct isl_device *dev,
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* ISL_H */
diff --git a/src/intel/isl/isl_gen4.h b/src/intel/isl/isl_gen4.h
index bc8aade..dc6102b 100644
--- a/src/intel/isl/isl_gen4.h
+++ b/src/intel/isl/isl_gen4.h
@@ -21,7 +21,8 @@
  *  IN THE SOFTWARE.
  */
 
-#pragma once
+#ifndef ISL_GEN4_H
+#define ISL_GEN4_H
 
 #include "isl.h"
 
@@ -46,3 +47,5 @@ isl_gen4_choose_image_alignment_el(const struct isl_device *dev,
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* ISL_GEN4_H */
diff --git a/src/intel/isl/isl_gen6.h b/src/intel/isl/isl_gen6.h
index 5151ff9..c954026 100644
--- a/src/intel/isl/isl_gen6.h
+++ b/src/intel/isl/isl_gen6.h
@@ -21,7 +21,8 @@
  *  IN THE SOFTWARE.
  */
 
-#pragma once
+#ifndef ISL_GEN6_H
+#define ISL_GEN6_H
 
 #include "isl.h"
 
@@ -46,3 +47,5 @@ isl_gen6_choose_image_alignment_el(const struct isl_device *dev,
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* ISL_GEN6_H */
diff --git a/src/intel/isl/isl_gen7.h b/src/intel/isl/isl_gen7.h
index ddc6cab..f1b7252 100644
--- a/src/intel/isl/isl_gen7.h
+++ b/src/intel/isl/isl_gen7.h
@@ -21,7 +21,8 @@
  *  IN THE SOFTWARE.
  */
 
-#pragma once
+#ifndef ISL_GEN7_H
+#define ISL_GEN7_H
 
 #include "isl.h"
 
@@ -51,3 +52,5 @@ isl_gen7_choose_image_alignment_el(const struct isl_device *dev,
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* ISL_GEN7_H */
diff --git a/src/intel/isl/isl_gen8.h b/src/intel/isl/isl_gen8.h
index 0a526ab..f5eb6a2 100644
--- a/src/intel/isl/isl_gen8.h
+++ b/src/intel/isl/isl_gen8.h
@@ -21,7 +21,8 @@
  *  IN THE SOFTWARE.
  */
 
-#pragma once
+#ifndef ISL_GEN8_H
+#define ISL_GEN8_H
 
 #include "isl.h"
 
@@ -46,3 +47,5 @@ isl_gen8_choose_image_alignment_el(const struct isl_device *dev,
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* ISL_GEN8_H */
diff --git a/src/intel/isl/isl_gen9.h b/src/intel/isl/isl_gen9.h
index 12b42dc..26d716f 100644
--- a/src/intel/isl/isl_gen9.h
+++ b/src/intel/isl/isl_gen9.h
@@ -21,7 +21,8 @@
  *  IN THE SOFTWARE.
  */
 
-#pragma once
+#ifndef ISL_GEN9_H
+#define ISL_GEN9_H
 
 #include "isl.h"
 
@@ -40,3 +41,5 @@ isl_gen9_choose_image_alignment_el(const struct isl_device *dev,
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* ISL_GEN9_H */
diff --git a/src/intel/isl/isl_priv.h b/src/intel/isl/isl_priv.h
index b539f10..dc3975d 100644
--- a/src/intel/isl/isl_priv.h
+++ b/src/intel/isl/isl_priv.h
@@ -21,7 +21,8 @@
  *  IN THE SOFTWARE.
  */
 
-#pragma once
+#ifndef ISL_PRIV_H
+#define ISL_PRIV_H
 
 #include <assert.h>
 #include <strings.h>
@@ -197,3 +198,5 @@ isl_gen8_buffer_fill_state_s(void *state,
 void
 isl_gen9_buffer_fill_state_s(void *state,
                              const struct isl_buffer_fill_state_info *restrict info);
+
+#endif /* ISL_PRIV_H */
-- 
2.7.4