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:
Emmanuele Bassi 2009-05-06 10:35:28 +01:00
parent 93c5769722
commit 3bde41c63c
5 changed files with 7 additions and 5 deletions

View File

@ -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

View File

@ -28,7 +28,7 @@
#ifndef __COGL_SHADER_H__
#define __COGL_SHADER_H__
#include <glib.h>
#include <cogl/cogl-types.h>
G_BEGIN_DECLS

View File

@ -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

View File

@ -24,6 +24,7 @@
#ifndef __COGL_DEFINES_H__
#define __COGL_DEFINES_H__
#include <glib.h>
#include <@CLUTTER_GL_HEADER@>
G_BEGIN_DECLS

View File

@ -26,6 +26,7 @@
#ifndef __COGL_DEFINES_H__
#define __COGL_DEFINES_H__
#include <glib.h>
#include <@CLUTTER_GL_HEADER@>
G_BEGIN_DECLS