Commit: ffa63d2de6714aeda8a226b9e11d9b9e0b8d94d6
Author: Campbell Barton
Date: Thu Apr 13 19:10:55 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBffa63d2de6714aeda8a226b9e11d9b9e0b8d94d6
Use regular header guards in GPU
===================================================================
M source/blender/gpu/GPU_batch.h
M source/blender/gpu/GPU_immediate.h
M source/blender/gpu/intern/gpu_shader_private.h
===================================================================
diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h
index 2232e333bb6..f27153ccecf 100644
--- a/source/blender/gpu/GPU_batch.h
+++ b/source/blender/gpu/GPU_batch.h
@@ -28,7 +28,8 @@
* This file contains any additions or modifications specific to Blender.
*/
-#pragma once
+#ifndef __GPU_BATCH_H__
+#define __GPU_BATCH_H__
#include "../../../intern/gawain/gawain/batch.h"
@@ -46,3 +47,5 @@ Batch *Batch_get_sphere_wire(int lod);
void gpu_batch_init(void);
void gpu_batch_exit(void);
+
+#endif /* __GPU_BATCH_H__ */
diff --git a/source/blender/gpu/GPU_immediate.h
b/source/blender/gpu/GPU_immediate.h
index 28522da5f28..2eb4eb94f48 100644
--- a/source/blender/gpu/GPU_immediate.h
+++ b/source/blender/gpu/GPU_immediate.h
@@ -28,7 +28,8 @@
* This file contains any additions or modifications specific to Blender.
*/
-#pragma once
+#ifndef __GPU_IMMEDIATE_H__
+#define __GPU_IMMEDIATE_H__
#include "../../../intern/gawain/gawain/immediate.h"
#include "../../../intern/gawain/gawain/imm_util.h"
@@ -54,3 +55,4 @@ void immUniformThemeColorBlendShade(int color_id1, int
color_id2, float fac, int
void immUniformThemeColorBlend(int color_id1, int color_id2, float fac);
void immThemeColorShadeAlpha(int colorid, int coloffset, int alphaoffset);
+#endif /* __GPU_IMMEDIATE_H__ */
diff --git a/source/blender/gpu/intern/gpu_shader_private.h
b/source/blender/gpu/intern/gpu_shader_private.h
index 10ffc17f0d5..c0c24187da5 100644
--- a/source/blender/gpu/intern/gpu_shader_private.h
+++ b/source/blender/gpu/intern/gpu_shader_private.h
@@ -22,7 +22,8 @@
* \ingroup gpu
*/
-#pragma once
+#ifndef __GPU_SHADER_PRIVATE_H__
+#define __GPU_SHADER_PRIVATE_H__
#include "GPU_glew.h"
#include "gawain/shader_interface.h"
@@ -39,3 +40,6 @@ struct GPUShader {
ShaderInterface *interface; /* cached uniform & attrib interface for
shader */
};
+
+#endif /* __GPU_SHADER_PRIVATE_H__ */
+
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
