From 0d86c92dcb7f918b00a1c96e2cb220e21da30d83 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 11 Oct 2016 18:26:21 +0100 Subject: [PATCH] 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 Reviewed-by: Chad Versace --- 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 480f1bb104f..aa52976bd95 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 #include @@ -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 62f16a3ad7a..88171bea53e 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 a88d0f87ba1..ba4c94c5ac7 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 @@ -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 */ -- 2.30.2