diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-03-14 19:30:38 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-03-14 19:30:38 +0000 |
| commit | f4bb21aa1d405fd11043a03e0962358eb0f42a5e (patch) | |
| tree | 5a61a68360791fb866dbd37544bc1e058793987a /glib/gconvert.h | |
| parent | 51d7fc9e965c64da40597d007756d330b5e3cc5f (diff) | |
| download | glib-f4bb21aa1d405fd11043a03e0962358eb0f42a5e.tar.gz | |
make it possible to disable single-file includes by defining
2008-03-14 Michael Natterer <mitch@imendio.com>
* glib/*.h: make it possible to disable single-file includes by
defining G_DISABLE_SINGLE_INCLUDES when building against GLib.
Approved by Tim Janik.
* glib/glib.h: include <glib/gslice.h>.
* glib/gi18n.h
* glib/gi18n-lib.h
* glib/gprintf.h: include <glib.h> so the above works when these
files are included without including <glib.h> first.
svn path=/trunk/; revision=6713
Diffstat (limited to 'glib/gconvert.h')
| -rw-r--r-- | glib/gconvert.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/glib/gconvert.h b/glib/gconvert.h index 9e6ca6501..15edb3512 100644 --- a/glib/gconvert.h +++ b/glib/gconvert.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_CONVERT_H__ #define __G_CONVERT_H__ |