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.
2025-05-31 01:40:06 +02:00 · 2001-11-18 00:38:48 +00:00 · 2001-11-18 00:38:48 +00:00 · 5852eace66
commit 5852eace66
parent 9d3cee6ac3
27 changed files with 178 additions and 5 deletions
--- a/15
+++ b/15
@ -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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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

--- 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__ */
--- 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@

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

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

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

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

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

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