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/gtktexttag.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/gtktexttag.h')
-rw-r--r-- | gtk/gtktexttag.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h index 37d10f4403..2074e23d87 100644 --- a/gtk/gtktexttag.h +++ b/gtk/gtktexttag.h @@ -1,5 +1,5 @@ -#ifndef GTK_TEXT_TAG_H -#define GTK_TEXT_TAG_H +#ifndef __GTK_TEXT_TAG_H__ +#define __GTK_TEXT_TAG_H__ #include <glib-object.h> #include <gdk/gdk.h> @@ -8,9 +8,7 @@ /* Not needed, retained for compatibility -Yosh */ #include <gtk/gtkobject.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef struct _GtkTextIter GtkTextIter; typedef struct _GtkTextTagTable GtkTextTagTable; @@ -231,9 +229,7 @@ void gtk_text_attributes_ref (GtkTextAttributes *values); GType gtk_text_attributes_get_type (void) G_GNUC_CONST; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif |