From 1e166c06933aea26638aa407b33c21939c69df96 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Wed, 19 Jul 2000 16:11:40 +0000 Subject: Include files outside of the extern "C" block. Makes some C++ compiler 2000-07-19 Sebastian Wilhelmi * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h, gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h, gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h, gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h, gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h, gtk/gtktypeutils.h: Include files outside of the extern "C" block. Makes some C++ compiler happy. Reported by Denis Vakatov . I really hope not to have caused a merging nightmare for all the branches out there. Otherwise I'll be available for crucifixion. --- gtk/gtktextlayout.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gtk/gtktextlayout.h') diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h index ffe2700608..457d36f929 100644 --- a/gtk/gtktextlayout.h +++ b/gtk/gtktextlayout.h @@ -1,6 +1,10 @@ #ifndef GTK_TEXT_LAYOUT_H #define GTK_TEXT_LAYOUT_H +#include +#include +#include + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -12,11 +16,6 @@ extern "C" { * to use it. */ -#include -#include -#include - - #define GTK_TYPE_TEXT_LAYOUT (gtk_text_layout_get_type()) #define GTK_TEXT_LAYOUT(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_LAYOUT, GtkTextLayout)) #define GTK_TEXT_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_LAYOUT, GtkTextLayoutClass)) -- cgit v1.2.1