diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-11-18 00:38:48 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-11-18 00:38:48 +0000 |
| commit | 5852eace661bf5411e091a792d47e67fb7fd352e (patch) | |
| tree | 792495709c48394b20f693c1035150210c547ac1 /gobject/gobject.h | |
| parent | 9d3cee6ac30121aa67d523e63892fb00dc77cd9e (diff) | |
| download | glib-5852eace661bf5411e091a792d47e67fb7fd352e.tar.gz | |
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.
Diffstat (limited to 'gobject/gobject.h')
| -rw-r--r-- | gobject/gobject.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gobject/gobject.h b/gobject/gobject.h index 5d3423228..cc5f3d7e7 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 <glib-object.h> can be included directly." +#endif + #include <gobject/gtype.h> #include <gobject/gvalue.h> #include <gobject/gparam.h> |