diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-03-14 04:26:57 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-03-14 04:26:57 +0000 |
| commit | 608a31b98e1420f487190871ee7312db2643d93d (patch) | |
| tree | 07095626ee002738e323deb5eda4d1246129d13b /glib/gconvert.c | |
| parent | 96913f7a507db5cd75e360b5f49423635d9b2660 (diff) | |
| download | glib-608a31b98e1420f487190871ee7312db2643d93d.tar.gz | |
Make PLT-reduction work with gcc4, and don't include everything in
2005-03-13 Matthias Clasen <mclasen@redhat.com>
Make PLT-reduction work with gcc4, and don't include
everything in galias.h:
* glib/glib.symbols: Group symbols by header and source file.
* glib/makegalias.pl: Protect definitions by the same
preprocessor symbols used to guard the headers. Move
the alias declarations to a separate file which is
produced when calling makegalias.pl -def
* glib/Makefile.am (galiasdef.c): Add a rule to generate this
file.
* glib/*.c: Include galias.h after the other GLib headers,
include galiasdef.c at the bottom.
Diffstat (limited to 'glib/gconvert.c')
| -rw-r--r-- | glib/gconvert.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/glib/gconvert.c b/glib/gconvert.c index dc065606c..d9561e4f7 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -28,7 +28,6 @@ #include <string.h> #include <stdlib.h> -#include "galias.h" #include "glib.h" #include "gprintfint.h" #include "gthreadinit.h" @@ -48,6 +47,8 @@ #error GNU libiconv not in use but included iconv.h is from libiconv #endif +#include "galias.h" + GQuark g_convert_error_quark (void) { @@ -2003,3 +2004,5 @@ g_filename_display_name (const gchar *filename) return display_name; } +#define __G_CONVERT_C__ +#include "galiasdef.c" |