Module: Mesa
Branch: master
Commit: 0d86c92dcb7f918b00a1c96e2cb220e21da30d83
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d86c92dcb7f918b00a1c96e2cb220e21da30d83
Author: Emil Velikov <emil.veli...@collabora.com>
Date: Tue Oct 11 18:26:21 2016 +0100
intel/blorp: use correct header guards
Avoid the discouraged use of pragma once and a missing guard for
blorp_genX_exec.h.
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Chad Versace <chadvers...@chromium.org>
---
src/intel/blorp/blorp.h | 5 ++++-
src/intel/blorp/blorp_genX_exec.h | 5 +++++
src/intel/blorp/blorp_priv.h | 5 ++++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/intel/blorp/blorp.h b/src/intel/blorp/blorp.h
index 480f1bb..aa52976 100644
--- a/src/intel/blorp/blorp.h
+++ b/src/intel/blorp/blorp.h
@@ -21,7 +21,8 @@
* IN THE SOFTWARE.
*/
-#pragma once
+#ifndef BLORP_H
+#define BLORP_H
#include <stdint.h>
#include <stdbool.h>
@@ -162,3 +163,5 @@ blorp_gen6_hiz_op(struct blorp_batch *batch,
#ifdef __cplusplus
} /* end extern "C" */
#endif /* __cplusplus */
+
+#endif /* BLORP_H */
diff --git a/src/intel/blorp/blorp_genX_exec.h
b/src/intel/blorp/blorp_genX_exec.h
index 62f16a3..88171be 100644
--- a/src/intel/blorp/blorp_genX_exec.h
+++ b/src/intel/blorp/blorp_genX_exec.h
@@ -21,6 +21,9 @@
* IN THE SOFTWARE.
*/
+#ifndef BLORP_GENX_EXEC_H
+#define BLORP_GENX_EXEC_H
+
#include "blorp_priv.h"
#include "common/gen_device_info.h"
#include "common/gen_sample_positions.h"
@@ -1223,3 +1226,5 @@ blorp_exec(struct blorp_batch *batch, const struct
blorp_params *params)
prim.InstanceCount = params->num_layers;
}
}
+
+#endif /* BLORP_GENX_EXEC_H */
diff --git a/src/intel/blorp/blorp_priv.h b/src/intel/blorp/blorp_priv.h
index a88d0f8..ba4c94c 100644
--- a/src/intel/blorp/blorp_priv.h
+++ b/src/intel/blorp/blorp_priv.h
@@ -21,7 +21,8 @@
* IN THE SOFTWARE.
*/
-#pragma once
+#ifndef BLORP_PRIV_H
+#define BLORP_PRIV_H
#include <stdint.h>
@@ -314,3 +315,5 @@ brw_blorp_compile_nir_shader(struct blorp_context *blorp,
struct nir_shader *nir
#ifdef __cplusplus
} /* end extern "C" */
#endif /* __cplusplus */
+
+#endif /* BLORP_PRIV_H */
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
