[cogl/cogl-1.10] Fix the header guards for cogl-texture-2d{, -private}.h
- From: Neil Roberts <nroberts src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.10] Fix the header guards for cogl-texture-2d{, -private}.h
- Date: Wed, 1 Aug 2012 10:49:02 +0000 (UTC)
commit a641a4d96d822bf9b4f07cd2dd1b071435332878
Author: Neil Roberts <neil linux intel com>
Date: Tue Jul 31 15:12:01 2012 +0100
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 <robert linux intel com>
(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 b19c6ea..6e60996 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-handle.h"
#include "cogl-pipeline-private.h"
@@ -105,4 +105,4 @@ _cogl_texture_2d_copy_from_framebuffer (CoglHandle handle,
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 f191924..6667be4 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"
@@ -187,4 +187,4 @@ cogl_texture_2d_new_from_foreign (CoglContext *ctx,
G_END_DECLS
-#endif /* __COGL_TEXURE_2D_H */
+#endif /* __COGL_TEXTURE_2D_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]