From 0e168ed0aa2f0c200c31456ad1f0b358a813e69d Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Tue, 31 Jul 2012 15:12:01 +0100 Subject: [PATCH] Fix the header guards for cogl-texture-2d{,-private}.h The header guard for cogl-texture-2d-private.h was __COGL_TEXTURE_2D_H. This would conflict with the header guard for cogl-texture-2d.h except there a small typo ('TEXURE') so that it was subtly different. This fixes them both to make more sense. Reviewed-by: Robert Bragg (cherry picked from commit 222ec4d009973cb62020a9da05f72dea41460b33) --- cogl/cogl-texture-2d-private.h | 6 +++--- cogl/cogl-texture-2d.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cogl/cogl-texture-2d-private.h b/cogl/cogl-texture-2d-private.h index 34abaa98c..823303cfb 100644 --- a/cogl/cogl-texture-2d-private.h +++ b/cogl/cogl-texture-2d-private.h @@ -21,8 +21,8 @@ * */ -#ifndef __COGL_TEXTURE_2D_H -#define __COGL_TEXTURE_2D_H +#ifndef __COGL_TEXTURE_2D_PRIVATE_H +#define __COGL_TEXTURE_2D_PRIVATE_H #include "cogl-object-private.h" #include "cogl-pipeline-private.h" @@ -103,4 +103,4 @@ _cogl_texture_2d_copy_from_framebuffer (CoglTexture2D *texture, int width, int height); -#endif /* __COGL_TEXTURE_2D_H */ +#endif /* __COGL_TEXTURE_2D_PRIVATE_H */ diff --git a/cogl/cogl-texture-2d.h b/cogl/cogl-texture-2d.h index 33671940f..bf35e3856 100644 --- a/cogl/cogl-texture-2d.h +++ b/cogl/cogl-texture-2d.h @@ -28,8 +28,8 @@ #error "Only can be included directly." #endif -#ifndef __COGL_TEXURE_2D_H -#define __COGL_TEXURE_2D_H +#ifndef __COGL_TEXTURE_2D_H +#define __COGL_TEXTURE_2D_H #include "cogl-context.h" @@ -225,4 +225,4 @@ cogl_texture_2d_new_from_foreign (CoglContext *ctx, G_END_DECLS -#endif /* __COGL_TEXURE_2D_H */ +#endif /* __COGL_TEXTURE_2D_H */