From 376d05bf3093d17236bf42ff53e7c757fe699e64 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 15 Apr 2017 17:51:08 +1000 Subject: [PATCH] Cleanup: GPU header guards --- source/blender/gpu/GPU_matrix.h | 7 ++++--- source/blender/gpu/GPU_uniformbuffer.h | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/source/blender/gpu/GPU_matrix.h b/source/blender/gpu/GPU_matrix.h index faa7d0bda64..45e35d13f25 100644 --- a/source/blender/gpu/GPU_matrix.h +++ b/source/blender/gpu/GPU_matrix.h @@ -29,8 +29,8 @@ * \ingroup gpu */ -#ifndef _GPU_MATRIX_H_ -#define _GPU_MATRIX_H_ +#ifndef __GPU_MATRIX_H__ +#define __GPU_MATRIX_H__ #include "BLI_sys_types.h" #include "GPU_glew.h" @@ -181,4 +181,5 @@ bool gpuMatricesDirty(void); /* since last bind */ # define gpuGetNormalMatrix(x) gpuGetNormalMatrix(_GPU_MAT3_CAST(x)) # define gpuGetNormalMatrixInverse(x) gpuGetNormalMatrixInverse(_GPU_MAT3_CAST(x)) #endif /* SUPPRESS_GENERIC_MATRIX_API */ -#endif /* GPU_MATRIX_H */ + +#endif /* __GPU_MATRIX_H__ */ diff --git a/source/blender/gpu/GPU_uniformbuffer.h b/source/blender/gpu/GPU_uniformbuffer.h index bcb6e1077b7..36b659e30b1 100644 --- a/source/blender/gpu/GPU_uniformbuffer.h +++ b/source/blender/gpu/GPU_uniformbuffer.h @@ -29,6 +29,9 @@ * \ingroup gpu */ +#ifndef __GPU_UNIFORMBUFFER_H__ +#define __GPU_UNIFORMBUFFER_H__ + typedef struct GPUUniformBuffer GPUUniformBuffer; GPUUniformBuffer *GPU_uniformbuffer_create(int size, const void *data, char err_out[256]); @@ -42,3 +45,5 @@ void GPU_uniformbuffer_unbind(GPUUniformBuffer *ubo); #endif int GPU_uniformbuffer_bindpoint(GPUUniformBuffer *ubo); + +#endif /* __GPU_UNIFORMBUFFER_H__ */