[Mesa-dev] [PATCH 07/18] spirv: consistently use ifndef guards over pragma once

Emil Velikov emil.l.velikov at gmail.com
Mon Mar 20 16:12:57 UTC 2017


Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/compiler/spirv/nir_spirv.h   | 2 --
 src/compiler/spirv/spirv_info.h  | 5 +++++
 src/compiler/spirv/vtn_private.h | 5 +++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/compiler/spirv/nir_spirv.h b/src/compiler/spirv/nir_spirv.h
index 1a312a91888..1779d1c5f3f 100644
--- a/src/compiler/spirv/nir_spirv.h
+++ b/src/compiler/spirv/nir_spirv.h
@@ -25,8 +25,6 @@
  *
  */
 
-#pragma once
-
 #ifndef _NIR_SPIRV_H_
 #define _NIR_SPIRV_H_
 
diff --git a/src/compiler/spirv/spirv_info.h b/src/compiler/spirv/spirv_info.h
index 1700001e78c..81d43ec925a 100644
--- a/src/compiler/spirv/spirv_info.h
+++ b/src/compiler/spirv/spirv_info.h
@@ -21,7 +21,12 @@
  * IN THE SOFTWARE.
  */
 
+#ifndef _SPIRV_INFO_H_
+#define _SPIRV_INFO_H_
+
 #include "spirv.h"
 
 const char *spirv_capability_to_string(SpvCapability cap);
 const char *spirv_decoration_to_string(SpvDecoration dec);
+
+#endif /* SPIRV_INFO_H */
diff --git a/src/compiler/spirv/vtn_private.h b/src/compiler/spirv/vtn_private.h
index cc866295274..5769c0c6cd2 100644
--- a/src/compiler/spirv/vtn_private.h
+++ b/src/compiler/spirv/vtn_private.h
@@ -25,6 +25,9 @@
  *
  */
 
+#ifndef _VTN_PRIVATE_H_
+#define _VTN_PRIVATE_H_
+
 #include "nir/nir.h"
 #include "nir/nir_builder.h"
 #include "nir/nir_array.h"
@@ -496,3 +499,5 @@ vtn_u64_literal(const uint32_t *w)
 {
    return (uint64_t)w[1] << 32 | w[0];
 }
+
+#endif /* _VTN_PRIVATE_H_ */
-- 
2.11.1



More information about the mesa-dev mailing list