[Cogl] [PATCH 4/4] Fix the header guards for cogl-texture-2d{, -private}.h

Neil Roberts neil at linux.intel.com
Tue Jul 31 07:15:31 PDT 2012


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.
---
 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 34abaa9..823303c 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 3367194..bf35e38 100644
--- a/cogl/cogl-texture-2d.h
+++ b/cogl/cogl-texture-2d.h
@@ -28,8 +28,8 @@
 #error "Only <cogl/cogl.h> 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 */
-- 
1.7.11.3.g3c3efa5



More information about the Cogl mailing list