Mesa (master): spirv: consistently use ifndef guards over pragma once

Emil Velikov evelikov at kemper.freedesktop.org
Wed Mar 22 16:59:31 UTC 2017


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

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Mon Mar 20 16:04:17 2017 +0000

spirv: consistently use ifndef guards over pragma once

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Acked-by: Vedran Miletić <vedran at miletic.net>
Acked-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Reviewed-by: Edward O'Callaghan <funfunctor at folklore1984.net>

---

 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 1a312a9188..1779d1c5f3 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 1700001e78..81d43ec925 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 cc86629527..5769c0c6cd 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_ */




More information about the mesa-commit mailing list