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/gtklayout.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/gtklayout.h')
| -rw-r--r-- | gtk/gtklayout.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h index fbe4b50819..ffd8b45daa 100644 --- a/gtk/gtklayout.h +++ b/gtk/gtklayout.h @@ -28,17 +28,14 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef __GTK_LAYOUT_H -#define __GTK_LAYOUT_H +#ifndef __GTK_LAYOUT_H__ +#define __GTK_LAYOUT_H__ #include <gdk/gdk.h> #include <gtk/gtkcontainer.h> #include <gtk/gtkadjustment.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_LAYOUT (gtk_layout_get_type ()) #define GTK_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LAYOUT, GtkLayout)) @@ -130,8 +127,6 @@ void gtk_layout_freeze (GtkLayout *layout); void gtk_layout_thaw (GtkLayout *layout); #endif /* GTK_DISABLE_DEPRECATED */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS -#endif /* __GTK_LAYOUT_H */ +#endif /* __GTK_LAYOUT_H__ */ |