brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the header guards for cogl-texture-2d{,-private}.h

Browse Source 
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)
This commit is contained in:
Neil Roberts 2012-07-31 15:12:01 +01:00 committed by Robert Bragg
parent 96b726b518
commit 0e168ed0aa
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cogl/cogl-texture-2d-private.h
View File

@ -21,8 +21,8 @@
* *
*/ */
#ifndef __COGL_TEXTURE_2D_H #ifndef __COGL_TEXTURE_2D_PRIVATE_H
#define __COGL_TEXTURE_2D_H #define __COGL_TEXTURE_2D_PRIVATE_H
#include "cogl-object-private.h" #include "cogl-object-private.h"
#include "cogl-pipeline-private.h" #include "cogl-pipeline-private.h"
@ -103,4 +103,4 @@ _cogl_texture_2d_copy_from_framebuffer (CoglTexture2D *texture,
int width, int width,
int height); int height);
#endif /* __COGL_TEXTURE_2D_H */ #endif /* __COGL_TEXTURE_2D_PRIVATE_H */

6
cogl/cogl-texture-2d.h
View File

@ -28,8 +28,8 @@
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif
#ifndef __COGL_TEXURE_2D_H #ifndef __COGL_TEXTURE_2D_H
#define __COGL_TEXURE_2D_H #define __COGL_TEXTURE_2D_H
#include "cogl-context.h" #include "cogl-context.h"
@ -225,4 +225,4 @@ cogl_texture_2d_new_from_foreign (CoglContext *ctx,
G_END_DECLS G_END_DECLS
#endif /* __COGL_TEXURE_2D_H */ #endif /* __COGL_TEXTURE_2D_H */