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/gtktextlayout.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/gtktextlayout.h')
| -rw-r--r-- | gtk/gtktextlayout.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h index 0e02b1294a..36a6efb51f 100644 --- a/gtk/gtktextlayout.h +++ b/gtk/gtktextlayout.h @@ -76,12 +76,8 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef GTK_TEXT_LAYOUT_H -#define GTK_TEXT_LAYOUT_H - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +#ifndef __GTK_TEXT_LAYOUT_H__ +#define __GTK_TEXT_LAYOUT_H__ /* This is a "semi-private" header; it is intended for * use by the text widget, and the text canvas item, @@ -96,6 +92,8 @@ extern "C" { #include <gtk/gtktextbuffer.h> #include <gtk/gtktextiter.h> +G_BEGIN_DECLS + /* forward declarations that have to be here to avoid including * gtktextbtree.h */ @@ -414,8 +412,6 @@ void gtk_text_anchored_child_set_layout (GtkWidget *child, void gtk_text_layout_spew (GtkTextLayout *layout); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS -#endif /* GTK_TEXT_LAYOUT_H */ +#endif /* __GTK_TEXT_LAYOUT_H__ */ |