[Mesa-dev] [PATCH 14/18] mesa/program: consistently use ifndef guards over pragma once

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


Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/mesa/program/ir_to_mesa.h            | 5 ++++-
 src/mesa/program/prog_parameter_layout.h | 1 -
 src/mesa/program/prog_to_nir.h           | 1 -
 src/mesa/program/program_parser.h        | 6 +++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/mesa/program/ir_to_mesa.h b/src/mesa/program/ir_to_mesa.h
index c46d090b774..09446197b24 100644
--- a/src/mesa/program/ir_to_mesa.h
+++ b/src/mesa/program/ir_to_mesa.h
@@ -21,7 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#pragma once
+#ifndef IR_TO_MESA_H
+#define IR_TO_MESA_H
 
 #include "main/glheader.h"
 
@@ -51,3 +52,5 @@ _mesa_associate_uniform_storage(struct gl_context *ctx,
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* IR_TO_MESA_H */
diff --git a/src/mesa/program/prog_parameter_layout.h b/src/mesa/program/prog_parameter_layout.h
index 99a7b6c7266..0e2d43a6256 100644
--- a/src/mesa/program/prog_parameter_layout.h
+++ b/src/mesa/program/prog_parameter_layout.h
@@ -28,7 +28,6 @@
  * \author Ian Romanick <ian.d.romanick at intel.com>
  */
 
-#pragma once
 
 #ifndef PROG_PARAMETER_LAYOUT_H
 #define PROG_PARAMETER_LAYOUT_H
diff --git a/src/mesa/program/prog_to_nir.h b/src/mesa/program/prog_to_nir.h
index 09425b52e17..22a2b420cf5 100644
--- a/src/mesa/program/prog_to_nir.h
+++ b/src/mesa/program/prog_to_nir.h
@@ -21,7 +21,6 @@
  * IN THE SOFTWARE.
  */
 
-#pragma once
 #ifndef PROG_TO_NIR_H
 #define PROG_TO_NIR_H
 
diff --git a/src/mesa/program/program_parser.h b/src/mesa/program/program_parser.h
index 412aca1e53d..dadce126247 100644
--- a/src/mesa/program/program_parser.h
+++ b/src/mesa/program/program_parser.h
@@ -20,7 +20,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#pragma once
+
+#ifndef PROGRAM_PARSER_H
+#define PROGRAM_PARSER_H
 
 #include "main/config.h"
 #include "program/prog_parameter.h"
@@ -288,3 +290,5 @@ extern int _mesa_parse_instruction_suffix(const struct asm_parser_state *state,
     const char *suffix, struct prog_instruction *inst);
 
 /*@}*/
+
+#endif /* PROGRAM_PARSER_H */
-- 
2.11.1



More information about the mesa-dev mailing list