diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-03-20 07:01:23 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-03-20 07:01:23 +0000 |
| commit | cca8dd63475ab582d8592039f1f69d7f22a3b928 (patch) | |
| tree | f800dcc62e1ab8a0010e774a05e669b14c3ff5e1 /gtk/gtkiconfactory.h | |
| parent | b39b0bfc0471258285169113bc176320b0b5ae71 (diff) | |
| download | gtk+-cca8dd63475ab582d8592039f1f69d7f22a3b928.tar.gz | |
Make PLT-reduction work with gcc4, and don't include everything in
2005-03-20 Matthias Clasen <mclasen@redhat.com>
Make PLT-reduction work with gcc4, and don't include
everything in gdkalias.h:
* gtk/grk.symbols: Group symbols by header and source file.
* gtk/makegtkalias.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 makegtkalias.pl -def
* gdk/Makefile.am (gtkaliasdef.c): Add a rule to generate
this file.
* gtk/*.c: Include gtkalias.h after the other headers,
include gtkaliasdef.c at the bottom.
* gtk/*.h: Small cleanups.
Diffstat (limited to 'gtk/gtkiconfactory.h')
| -rw-r--r-- | gtk/gtkiconfactory.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h index 79e6ffeccc..38fb51492e 100644 --- a/gtk/gtkiconfactory.h +++ b/gtk/gtkiconfactory.h @@ -30,9 +30,7 @@ #include <gdk/gdk.h> #include <gtk/gtkrc.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef struct _GtkIconFactoryClass GtkIconFactoryClass; @@ -182,8 +180,6 @@ void _gtk_icon_set_invalidate_caches (void); GSList* _gtk_icon_factory_list_ids (void); void _gtk_icon_factory_ensure_default_icons (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_ICON_FACTORY_H__ */ |