AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

define GDK_PIXBUF_H_INSIDE around including all other headers.

Browse Source 
2008-05-28  Michael Natterer  <mitch@imendio.com>

	* gdk-pixbuf.h: define GDK_PIXBUF_H_INSIDE around including all
	other headers.

	* gdk-pixbuf-animation.h
	* gdk-pixbuf-core.h
	* gdk-pixbuf-enum-types.h.template
	* gdk-pixbuf-features.h.in
	* gdk-pixbuf-io.h
	* gdk-pixbuf-loader.h
	* gdk-pixbuf-simple-anim.h
	* gdk-pixbuf-transform.h: add single-include guards that #error
	out if GDK_PIXBUF_DISABLE_SINGLE_INCLUDES is defined and any of
	these files is included individually.

	* gdk-pixbuf-private.h: don't incude "gdk-pixbuf-io.h".

	* gdk-pixbuf-csource.c: #define __GTK_H_INSIDE__ around including
	"../gtk/gtkversion.h". Ugly but needed in this special case.


svn path=/trunk/; revision=20214
This commit is contained in:
Michael Natterer 2008-05-28 13:39:52 +00:00 committed by Michael Natterer
parent 2650257f3b
commit 83b215f9ea
12 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,24 @@
2008-05-28 Michael Natterer <mitch@imendio.com>
* gdk-pixbuf.h: define GDK_PIXBUF_H_INSIDE around including all
other headers.
* gdk-pixbuf-animation.h
* gdk-pixbuf-core.h
* gdk-pixbuf-enum-types.h.template
* gdk-pixbuf-features.h.in
* gdk-pixbuf-io.h
* gdk-pixbuf-loader.h
* gdk-pixbuf-simple-anim.h
* gdk-pixbuf-transform.h: add single-include guards that #error
out if GDK_PIXBUF_DISABLE_SINGLE_INCLUDES is defined and any of
these files is included individually.
* gdk-pixbuf-private.h: don't incude "gdk-pixbuf-io.h".
* gdk-pixbuf-csource.c: #define __GTK_H_INSIDE__ around including
"../gtk/gtkversion.h". Ugly but needed in this special case.
2008-05-27 Tor Lillqvist <tml@novell.com>
* io-*.c: Use explicit G_MODULE_EXPORT decoration when building

5
gdk-pixbuf/gdk-pixbuf-animation.h
View File

@ -24,10 +24,13 @@
* Boston, MA 02111-1307, USA.
*/
#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
#endif
#ifndef GDK_PIXBUF_ANIMATION_H
#define GDK_PIXBUF_ANIMATION_H
#include <glib.h>
#include <glib-object.h>
#include <gdk-pixbuf/gdk-pixbuf-core.h>

4
gdk-pixbuf/gdk-pixbuf-core.h
View File

@ -23,6 +23,10 @@
* Boston, MA 02111-1307, USA.
*/
#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
#endif
#ifndef GDK_PIXBUF_CORE_H
#define GDK_PIXBUF_CORE_H

2
gdk-pixbuf/gdk-pixbuf-csource.c
View File

@ -18,7 +18,9 @@
*/
#include <config.h>
#define __GTK_H_INSIDE__
#include "../gtk/gtkversion.h" /* versioning */
#undef __GTK_H_INSIDE__
#include "gdk-pixbuf.h"
#include "gdk-pixdata.h"
#include <glib/gprintf.h>

4
gdk-pixbuf/gdk-pixbuf-enum-types.h.template
View File

@ -1,4 +1,8 @@
/*** BEGIN file-header ***/
#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
#endif
#ifndef __GDK_PIXBUF_ENUM_TYPES_H__
#define __GDK_PIXBUF_ENUM_TYPES_H__

4
gdk-pixbuf/gdk-pixbuf-features.h.in
View File

@ -1,3 +1,7 @@
#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
#endif
#ifndef GDK_PIXBUF_FEATURES_H
#define GDK_PIXBUF_FEATURES_H 1

4
gdk-pixbuf/gdk-pixbuf-io.h
View File

@ -26,6 +26,10 @@
* Boston, MA 02111-1307, USA.
*/
#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
#endif
#ifndef GDK_PIXBUF_IO_H
#define GDK_PIXBUF_IO_H

4
gdk-pixbuf/gdk-pixbuf-loader.h
View File

@ -23,6 +23,10 @@
* Boston, MA 02111-1307, USA.
*/
#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
#endif
#ifndef GDK_PIXBUF_LOADER_H
#define GDK_PIXBUF_LOADER_H

1
gdk-pixbuf/gdk-pixbuf-private.h
View File

@ -28,7 +28,6 @@
#define GDK_PIXBUF_PRIVATE_H
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-io.h"
#include "gdk-pixbuf-i18n.h"
#include <stdio.h>

4
gdk-pixbuf/gdk-pixbuf-simple-anim.h
View File

@ -21,6 +21,10 @@
* Boston, MA 02111-1307, USA.
*/
#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
#endif
#ifndef GDK_PIXBUF_SIMPLE_ANIM_H
#define GDK_PIXBUF_SIMPLE_ANIM_H

4
gdk-pixbuf/gdk-pixbuf-transform.h
View File

@ -23,6 +23,10 @@
* Boston, MA 02111-1307, USA.
*/
#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
#endif
#ifndef GDK_PIXBUF_TRANSFORM_H
#define GDK_PIXBUF_TRANSFORM_H

3
gdk-pixbuf/gdk-pixbuf.h
View File

@ -26,6 +26,8 @@
#ifndef GDK_PIXBUF_H
#define GDK_PIXBUF_H
#define GDK_PIXBUF_H_INSIDE
#include <glib.h>
#include <gdk-pixbuf/gdk-pixbuf-features.h>
#include <glib-object.h>
@ -38,5 +40,6 @@
#include <gdk-pixbuf/gdk-pixbuf-loader.h>
#include <gdk-pixbuf/gdk-pixbuf-enum-types.h>
#undef GDK_PIXBUF_H_INSIDE
#endif /* GDK_PIXBUF_H */