From 5852eace661bf5411e091a792d47e67fb7fd352e Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 18 Nov 2001 00:38:48 +0000 Subject: [PATCH] Include gtypes.h not gobject/gtype.h Sat Nov 17 14:10:35 2001 Owen Taylor * glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h * glib/glib-object.h gobject/*.h: Prevent headers from being included directly except when compiling GObject. * gobject/gvaluecollector.h: Include glib-object.h so that this file can be included directly, since we don't include it _from_ glib-object.h. * gobject/gtype.c: Remove struct _GValue hack since we now include glib/gvaluecollector.h which simply pulls in glib-object.h. --- ChangeLog | 15 +++++++++++++++ ChangeLog.pre-2-0 | 15 +++++++++++++++ ChangeLog.pre-2-10 | 15 +++++++++++++++ ChangeLog.pre-2-12 | 15 +++++++++++++++ ChangeLog.pre-2-2 | 15 +++++++++++++++ ChangeLog.pre-2-4 | 15 +++++++++++++++ ChangeLog.pre-2-6 | 15 +++++++++++++++ ChangeLog.pre-2-8 | 15 +++++++++++++++ glib/gbsearcharray.h | 5 ++++- glib/glib-object.h | 3 +++ gobject/Makefile.am | 1 + gobject/gboxed.h | 4 ++++ gobject/gclosure.h | 3 +++ gobject/genums.h | 4 ++++ gobject/gobject.h | 4 ++++ gobject/gparam.h | 3 +++ gobject/gparamspecs.h | 3 +++ gobject/gsignal.h | 3 +++ gobject/gsourceclosure.h | 4 ++++ gobject/gtype.c | 4 ---- gobject/gtype.h | 4 ++++ gobject/gtypemodule.h | 4 ++++ gobject/gtypeplugin.h | 3 +++ gobject/gvalue.h | 3 +++ gobject/gvaluearray.h | 3 +++ gobject/gvaluecollector.h | 2 ++ gobject/gvaluetypes.h | 3 +++ 27 files changed, 178 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d145641..b9d0465 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Sat Nov 17 14:10:35 2001 Owen Taylor + + * glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h + + * glib/glib-object.h gobject/*.h: Prevent headers from + being included directly except when compiling GObject. + + * gobject/gvaluecollector.h: Include glib-object.h so that + this file can be included directly, since we don't + include it _from_ glib-object.h. + + * gobject/gtype.c: Remove struct _GValue hack since we + now include glib/gvaluecollector.h which simply pulls in + glib-object.h. + 2001-11-15 Matthias Clasen * glib/giochannel.c: Documentation fixes. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index d145641..b9d0465 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,18 @@ +Sat Nov 17 14:10:35 2001 Owen Taylor + + * glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h + + * glib/glib-object.h gobject/*.h: Prevent headers from + being included directly except when compiling GObject. + + * gobject/gvaluecollector.h: Include glib-object.h so that + this file can be included directly, since we don't + include it _from_ glib-object.h. + + * gobject/gtype.c: Remove struct _GValue hack since we + now include glib/gvaluecollector.h which simply pulls in + glib-object.h. + 2001-11-15 Matthias Clasen * glib/giochannel.c: Documentation fixes. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d145641..b9d0465 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,18 @@ +Sat Nov 17 14:10:35 2001 Owen Taylor + + * glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h + + * glib/glib-object.h gobject/*.h: Prevent headers from + being included directly except when compiling GObject. + + * gobject/gvaluecollector.h: Include glib-object.h so that + this file can be included directly, since we don't + include it _from_ glib-object.h. + + * gobject/gtype.c: Remove struct _GValue hack since we + now include glib/gvaluecollector.h which simply pulls in + glib-object.h. + 2001-11-15 Matthias Clasen * glib/giochannel.c: Documentation fixes. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index d145641..b9d0465 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,18 @@ +Sat Nov 17 14:10:35 2001 Owen Taylor + + * glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h + + * glib/glib-object.h gobject/*.h: Prevent headers from + being included directly except when compiling GObject. + + * gobject/gvaluecollector.h: Include glib-object.h so that + this file can be included directly, since we don't + include it _from_ glib-object.h. + + * gobject/gtype.c: Remove struct _GValue hack since we + now include glib/gvaluecollector.h which simply pulls in + glib-object.h. + 2001-11-15 Matthias Clasen * glib/giochannel.c: Documentation fixes. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index d145641..b9d0465 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,18 @@ +Sat Nov 17 14:10:35 2001 Owen Taylor + + * glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h + + * glib/glib-object.h gobject/*.h: Prevent headers from + being included directly except when compiling GObject. + + * gobject/gvaluecollector.h: Include glib-object.h so that + this file can be included directly, since we don't + include it _from_ glib-object.h. + + * gobject/gtype.c: Remove struct _GValue hack since we + now include glib/gvaluecollector.h which simply pulls in + glib-object.h. + 2001-11-15 Matthias Clasen * glib/giochannel.c: Documentation fixes. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d145641..b9d0465 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,18 @@ +Sat Nov 17 14:10:35 2001 Owen Taylor + + * glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h + + * glib/glib-object.h gobject/*.h: Prevent headers from + being included directly except when compiling GObject. + + * gobject/gvaluecollector.h: Include glib-object.h so that + this file can be included directly, since we don't + include it _from_ glib-object.h. + + * gobject/gtype.c: Remove struct _GValue hack since we + now include glib/gvaluecollector.h which simply pulls in + glib-object.h. + 2001-11-15 Matthias Clasen * glib/giochannel.c: Documentation fixes. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d145641..b9d0465 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,18 @@ +Sat Nov 17 14:10:35 2001 Owen Taylor + + * glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h + + * glib/glib-object.h gobject/*.h: Prevent headers from + being included directly except when compiling GObject. + + * gobject/gvaluecollector.h: Include glib-object.h so that + this file can be included directly, since we don't + include it _from_ glib-object.h. + + * gobject/gtype.c: Remove struct _GValue hack since we + now include glib/gvaluecollector.h which simply pulls in + glib-object.h. + 2001-11-15 Matthias Clasen * glib/giochannel.c: Documentation fixes. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d145641..b9d0465 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,18 @@ +Sat Nov 17 14:10:35 2001 Owen Taylor + + * glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h + + * glib/glib-object.h gobject/*.h: Prevent headers from + being included directly except when compiling GObject. + + * gobject/gvaluecollector.h: Include glib-object.h so that + this file can be included directly, since we don't + include it _from_ glib-object.h. + + * gobject/gtype.c: Remove struct _GValue hack since we + now include glib/gvaluecollector.h which simply pulls in + glib-object.h. + 2001-11-15 Matthias Clasen * glib/giochannel.c: Documentation fixes. diff --git a/glib/gbsearcharray.h b/glib/gbsearcharray.h index 1682a76..61b90b4 100644 --- a/glib/gbsearcharray.h +++ b/glib/gbsearcharray.h @@ -21,7 +21,10 @@ #ifndef __G_BSEARCH_ARRAY_H__ #define __G_BSEARCH_ARRAY_H__ -#include +#include +#include +#include +#include G_BEGIN_DECLS diff --git a/glib/glib-object.h b/glib/glib-object.h index aefdd2f..8687ef1 100644 --- a/glib/glib-object.h +++ b/glib/glib-object.h @@ -19,6 +19,8 @@ #ifndef __GLIB_GOBJECT_H__ #define __GLIB_GOBJECT_H__ +#define __GLIB_GOBJECT_H_INSIDE__ + /* topmost include file for GObject header files */ #include #include @@ -34,5 +36,6 @@ #include #include +#undef __GLIB_GOBJECT_H_INSIDE__ #endif /* __GLIB_GOBJECT_H__ */ diff --git a/gobject/Makefile.am b/gobject/Makefile.am index 63bdccb..5184fef 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -9,6 +9,7 @@ INCLUDES = @STRIP_BEGIN@ \ -I$(top_srcdir)/glib \ -I$(top_builddir) \ @GLIB_DEBUG_FLAGS@ \ + -DGOBJECT_COMPILATION \ -DG_DISABLE_CONST_RETURNS \ @STRIP_END@ diff --git a/gobject/gboxed.h b/gobject/gboxed.h index e29d95a..df92251 100644 --- a/gobject/gboxed.h +++ b/gobject/gboxed.h @@ -19,6 +19,10 @@ #ifndef __G_BOXED_H__ #define __G_BOXED_H__ +#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) +#error "Only can be included directly." +#endif + #include G_BEGIN_DECLS diff --git a/gobject/gclosure.h b/gobject/gclosure.h index d188d05..aa60540 100644 --- a/gobject/gclosure.h +++ b/gobject/gclosure.h @@ -19,6 +19,9 @@ #ifndef __G_CLOSURE_H__ #define __G_CLOSURE_H__ +#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) +#error "Only can be included directly." +#endif #include diff --git a/gobject/genums.h b/gobject/genums.h index 699d4bd..ea2c4be 100644 --- a/gobject/genums.h +++ b/gobject/genums.h @@ -19,6 +19,10 @@ #ifndef __G_ENUMS_H__ #define __G_ENUMS_H__ +#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) +#error "Only can be included directly." +#endif + #include G_BEGIN_DECLS diff --git a/gobject/gobject.h b/gobject/gobject.h index 5d34232..cc5f3d7 100644 --- a/gobject/gobject.h +++ b/gobject/gobject.h @@ -19,6 +19,10 @@ #ifndef __G_OBJECT_H__ #define __G_OBJECT_H__ +#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) +#error "Only can be included directly." +#endif + #include #include #include diff --git a/gobject/gparam.h b/gobject/gparam.h index 6ed1c00..97ec620 100644 --- a/gobject/gparam.h +++ b/gobject/gparam.h @@ -21,6 +21,9 @@ #ifndef __G_PARAM_H__ #define __G_PARAM_H__ +#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) +#error "Only can be included directly." +#endif #include diff --git a/gobject/gparamspecs.h b/gobject/gparamspecs.h index 98a15f6..075291e 100644 --- a/gobject/gparamspecs.h +++ b/gobject/gparamspecs.h @@ -21,6 +21,9 @@ #ifndef __G_PARAMSPECS_H__ #define __G_PARAMSPECS_H__ +#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) +#error "Only can be included directly." +#endif #include #include diff --git a/gobject/gsignal.h b/gobject/gsignal.h index a37d550..39cf580 100644 --- a/gobject/gsignal.h +++ b/gobject/gsignal.h @@ -19,6 +19,9 @@ #ifndef __G_SIGNAL_H__ #define __G_SIGNAL_H__ +#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) +#error "Only can be included directly." +#endif #include #include diff --git a/gobject/gsourceclosure.h b/gobject/gsourceclosure.h index e12e15b..d017b72 100644 --- a/gobject/gsourceclosure.h +++ b/gobject/gsourceclosure.h @@ -19,6 +19,10 @@ #ifndef __G_SOURCECLOSURE_H__ +#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) +#error "Only can be included directly." +#endif + #include G_BEGIN_DECLS diff --git a/gobject/gtype.c b/gobject/gtype.c index abe2e39..427ff2f 100644 --- a/gobject/gtype.c +++ b/gobject/gtype.c @@ -137,10 +137,6 @@ static IFaceHolder* type_iface_peek_holder_L (TypeNode *iface, /* --- structures --- */ -struct _GValue /* kludge, keep in sync with gvalue.h */ -{ - GType g_type; -}; struct _TypeNode { GTypePlugin *plugin; diff --git a/gobject/gtype.h b/gobject/gtype.h index 0ae6475..aeb770d 100644 --- a/gobject/gtype.h +++ b/gobject/gtype.h @@ -19,6 +19,10 @@ #ifndef __G_TYPE_H__ #define __G_TYPE_H__ +#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) +#error "Only can be included directly." +#endif + #include G_BEGIN_DECLS diff --git a/gobject/gtypemodule.h b/gobject/gtypemodule.h index b65bade..4871f81 100644 --- a/gobject/gtypemodule.h +++ b/gobject/gtypemodule.h @@ -20,6 +20,10 @@ #ifndef __G_TYPE_MODULE_H__ #define __G_TYPE_MODULE_H__ +#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) +#error "Only can be included directly." +#endif + #include G_BEGIN_DECLS diff --git a/gobject/gtypeplugin.h b/gobject/gtypeplugin.h index df69258..26f4952 100644 --- a/gobject/gtypeplugin.h +++ b/gobject/gtypeplugin.h @@ -19,6 +19,9 @@ #ifndef __G_TYPE_PLUGIN_H__ #define __G_TYPE_PLUGIN_H__ +#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) +#error "Only can be included directly." +#endif #include diff --git a/gobject/gvalue.h b/gobject/gvalue.h index 4afb95c..54310ef 100644 --- a/gobject/gvalue.h +++ b/gobject/gvalue.h @@ -21,6 +21,9 @@ #ifndef __G_VALUE_H__ #define __G_VALUE_H__ +#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) +#error "Only can be included directly." +#endif #include diff --git a/gobject/gvaluearray.h b/gobject/gvaluearray.h index a242731..456962e 100644 --- a/gobject/gvaluearray.h +++ b/gobject/gvaluearray.h @@ -21,6 +21,9 @@ #ifndef __G_VALUE_ARRAY_H__ #define __G_VALUE_ARRAY_H__ +#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) +#error "Only can be included directly." +#endif #include diff --git a/gobject/gvaluecollector.h b/gobject/gvaluecollector.h index 0f5e865..e937996 100644 --- a/gobject/gvaluecollector.h +++ b/gobject/gvaluecollector.h @@ -21,6 +21,8 @@ #ifndef __G_VALUE_COLLECTOR_H__ #define __G_VALUE_COLLECTOR_H__ +#include + G_BEGIN_DECLS /* we may want to add aggregate types here some day, if requested diff --git a/gobject/gvaluetypes.h b/gobject/gvaluetypes.h index 0629007..0423d5e 100644 --- a/gobject/gvaluetypes.h +++ b/gobject/gvaluetypes.h @@ -21,6 +21,9 @@ #ifndef __G_VALUETYPES_H__ #define __G_VALUETYPES_H__ +#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) +#error "Only can be included directly." +#endif #include -- 2.7.4