mirror of
https://github.com/brl/mutter.git
synced 2024-11-26 01:50:42 -05:00
Fix inclusion guards and headers
The C++ inclusion guards G_BEGIN_DECLS and G_END_DECLS are defined by GLib; so we need to include glib.h before using them.
This commit is contained in:
parent
93c5769722
commit
3bde41c63c
@ -28,10 +28,10 @@
|
||||
#ifndef __COGL_BITMAP_H__
|
||||
#define __COGL_BITMAP_H__
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#include <cogl/cogl-types.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
/**
|
||||
* SECTION:cogl-bitmap
|
||||
* @short_description: Fuctions for loading images but not directly
|
||||
|
@ -28,7 +28,7 @@
|
||||
#ifndef __COGL_SHADER_H__
|
||||
#define __COGL_SHADER_H__
|
||||
|
||||
#include <glib.h>
|
||||
#include <cogl/cogl-types.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
@ -28,10 +28,10 @@
|
||||
#ifndef __COGL_TEXTURE_H__
|
||||
#define __COGL_TEXTURE_H__
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#include <cogl/cogl-types.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
/**
|
||||
* SECTION:cogl-texture
|
||||
* @short_description: Fuctions for creating and manipulating textures
|
||||
|
@ -24,6 +24,7 @@
|
||||
#ifndef __COGL_DEFINES_H__
|
||||
#define __COGL_DEFINES_H__
|
||||
|
||||
#include <glib.h>
|
||||
#include <@CLUTTER_GL_HEADER@>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
@ -26,6 +26,7 @@
|
||||
#ifndef __COGL_DEFINES_H__
|
||||
#define __COGL_DEFINES_H__
|
||||
|
||||
#include <glib.h>
|
||||
#include <@CLUTTER_GL_HEADER@>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
Loading…
Reference in New Issue
Block a user