Include gtypes.h not gobject/gtype.h

Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>

	* 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.

diff --git a/ChangeLog b/ChangeLog
index d1456419fc932b9b81b653429edbbdb7004d430f..b9d0465fb2c5a7116357c2852c1bd18f5acf51c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <matthiasc@poet.de>
 
        * glib/giochannel.c: Documentation fixes.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d1456419fc932b9b81b653429edbbdb7004d430f..b9d0465fb2c5a7116357c2852c1bd18f5acf51c4 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,18 @@
+Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <matthiasc@poet.de>
 
        * glib/giochannel.c: Documentation fixes.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d1456419fc932b9b81b653429edbbdb7004d430f..b9d0465fb2c5a7116357c2852c1bd18f5acf51c4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,18 @@
+Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <matthiasc@poet.de>
 
        * glib/giochannel.c: Documentation fixes.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index d1456419fc932b9b81b653429edbbdb7004d430f..b9d0465fb2c5a7116357c2852c1bd18f5acf51c4 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,18 @@
+Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <matthiasc@poet.de>
 
        * glib/giochannel.c: Documentation fixes.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d1456419fc932b9b81b653429edbbdb7004d430f..b9d0465fb2c5a7116357c2852c1bd18f5acf51c4 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,18 @@
+Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <matthiasc@poet.de>
 
        * glib/giochannel.c: Documentation fixes.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d1456419fc932b9b81b653429edbbdb7004d430f..b9d0465fb2c5a7116357c2852c1bd18f5acf51c4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,18 @@
+Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <matthiasc@poet.de>
 
        * glib/giochannel.c: Documentation fixes.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d1456419fc932b9b81b653429edbbdb7004d430f..b9d0465fb2c5a7116357c2852c1bd18f5acf51c4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,18 @@
+Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <matthiasc@poet.de>
 
        * glib/giochannel.c: Documentation fixes.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d1456419fc932b9b81b653429edbbdb7004d430f..b9d0465fb2c5a7116357c2852c1bd18f5acf51c4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,18 @@
+Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <matthiasc@poet.de>
 
        * glib/giochannel.c: Documentation fixes.

diff --git a/glib/gbsearcharray.h b/glib/gbsearcharray.h
index 1682a76064e868d2e006d86b93c6127576059dcd..61b90b42bbf293b71e52a78341de6267b8f0b446 100644 (file)
--- a/glib/gbsearcharray.h
+++ b/glib/gbsearcharray.h
@@ -21,7 +21,10 @@
 #ifndef __G_BSEARCH_ARRAY_H__
 #define __G_BSEARCH_ARRAY_H__
 
-#include        <gobject/gtype.h>
+#include        <glib/gtypes.h>
+#include        <glib/gutils.h>
+#include        <glib/gmem.h>
+#include        <glib/gmessages.h>
 
 G_BEGIN_DECLS
 

diff --git a/glib/glib-object.h b/glib/glib-object.h
index aefdd2f804585d0821ddc5a2f6c08fd476f179a2..8687ef1f2e68d51741960ab3539d7c6612159f57 100644 (file)
--- 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       <gobject/gboxed.h>
 #include       <gobject/genums.h>
@@ -34,5 +36,6 @@
 #include       <gobject/gvaluearray.h>
 #include       <gobject/gvaluetypes.h>
 
+#undef __GLIB_GOBJECT_H_INSIDE__
 
 #endif /* __GLIB_GOBJECT_H__ */

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 63bdccbc5edbaa431de1a00b48cd364f581e2a21..5184fef5240c6b065bd91225c982e20b357aec0f 100644 (file)
--- 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 e29d95ac5b53bca382f20e92dd46fd722de155bb..df92251c56743a0351766df4bb77976c23d66bb7 100644 (file)
--- 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 <glib-object.h> can be included directly."
+#endif
+
 #include        <gobject/gtype.h>
 
 G_BEGIN_DECLS

diff --git a/gobject/gclosure.h b/gobject/gclosure.h
index d188d0570d32b3b95f4f987ee72611182fb458eb..aa605404d9df7e4623d757dc0ebb8c9d846074e3 100644 (file)
--- 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 <glib-object.h> can be included directly."
+#endif
 
 #include        <gobject/gtype.h>
 

diff --git a/gobject/genums.h b/gobject/genums.h
index 699d4bd5f77d33293a39b3bf13beb33f82476057..ea2c4be8763c7bbd79e0ca63c1d78eeef19e3753 100644 (file)
--- 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 <glib-object.h> can be included directly."
+#endif
+
 #include <gobject/gtype.h>
 
 G_BEGIN_DECLS

diff --git a/gobject/gobject.h b/gobject/gobject.h
index 5d3423228c0075805b0fd1a4df62c373f104a76f..cc5f3d7e78f5f9600209a4b550d548608725707b 100644 (file)
--- 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 <glib-object.h> can be included directly."
+#endif
+
 #include        <gobject/gtype.h>
 #include        <gobject/gvalue.h>
 #include        <gobject/gparam.h>

diff --git a/gobject/gparam.h b/gobject/gparam.h
index 6ed1c00c91311e4ec4f40dfc2c447495dbfbfca4..97ec6207667243ea10205afaa6f10f271fe08bec 100644 (file)
--- 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 <glib-object.h> can be included directly."
+#endif
 
 #include       <gobject/gvalue.h>
 

diff --git a/gobject/gparamspecs.h b/gobject/gparamspecs.h
index 98a15f678eb3ed712a264d5dc6ba7982d45b146b..075291ed4e9f1f3391d52ae7e7fda0b2fa908010 100644 (file)
--- 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 <glib-object.h> can be included directly."
+#endif
 
 #include        <gobject/gvalue.h>
 #include        <gobject/genums.h>

diff --git a/gobject/gsignal.h b/gobject/gsignal.h
index a37d550ee00634f9eb56e4592ba2a3a2c81f4184..39cf580b7471d1c85e46ffa3052e0073ae370a77 100644 (file)
--- 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 <glib-object.h> can be included directly."
+#endif
 
 #include       <gobject/gclosure.h>
 #include       <gobject/gvalue.h>

diff --git a/gobject/gsourceclosure.h b/gobject/gsourceclosure.h
index e12e15bfb6ccc50e97545b7f25f672f80e25b39c..d017b72f932c767027a6e66539bdbb42e2f6c9e7 100644 (file)
--- 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 <glib-object.h> can be included directly."
+#endif
+
 #include <gobject/gclosure.h>
 
 G_BEGIN_DECLS

diff --git a/gobject/gtype.c b/gobject/gtype.c
index abe2e399b5351ffd4c0c8bbb3255c5a182a95ccc..427ff2f0b3fd9aca90c474015d4fda87622408ae 100644 (file)
--- 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 0ae6475cbe6143f5a6f629876457685eb9a9101c..aeb770d2fadc672841f2f546a67806edcb4a2f43 100644 (file)
--- 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 <glib-object.h> can be included directly."
+#endif
+
 #include        <glib.h>
 
 G_BEGIN_DECLS

diff --git a/gobject/gtypemodule.h b/gobject/gtypemodule.h
index b65badea72bc6be419f4dc818fb90919366813eb..4871f81b4895332c9fe734397babfa08f299ab03 100644 (file)
--- 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 <glib-object.h> can be included directly."
+#endif
+
 #include <gobject/gobject.h>
 
 G_BEGIN_DECLS

diff --git a/gobject/gtypeplugin.h b/gobject/gtypeplugin.h
index df692589ac15dca7cda5e9416dc215c0710d78c0..26f4952195599561ebd26e354952df2a52173ff7 100644 (file)
--- 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 <glib-object.h> can be included directly."
+#endif
 
 #include       <gobject/gtype.h>
 

diff --git a/gobject/gvalue.h b/gobject/gvalue.h
index 4afb95cefdc390b34d26c9299d5b17e593fd541e..54310effecd88154e9bec0ec6056a2c757190324 100644 (file)
--- 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 <glib-object.h> can be included directly."
+#endif
 
 #include       <gobject/gtype.h>
 

diff --git a/gobject/gvaluearray.h b/gobject/gvaluearray.h
index a2427317508facca066d69b3e634ab46b1288680..456962e3a6ca4a5b9b0fe5bbe5c3875e7a56afd9 100644 (file)
--- 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 <glib-object.h> can be included directly."
+#endif
 
 #include       <gobject/gvalue.h>
 

diff --git a/gobject/gvaluecollector.h b/gobject/gvaluecollector.h
index 0f5e86524cc4eafaf7b09a454b40e19467c0a931..e9379968a368971c03df84bdfb27f5ad3c2c15fc 100644 (file)
--- a/gobject/gvaluecollector.h
+++ b/gobject/gvaluecollector.h
@@ -21,6 +21,8 @@
 #ifndef __G_VALUE_COLLECTOR_H__
 #define __G_VALUE_COLLECTOR_H__
 
+#include <glib-object.h>
+
 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 06290075ff13e30b47f1c5c7228fdcac8bf64061..0423d5e05e31a9fd00a7223c744ed3c0a7454c97 100644 (file)
--- 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 <glib-object.h> can be included directly."
+#endif
 
 #include       <gobject/gvalue.h>