From dbae37fd65b6e31e9aa99f8bd6b8ae3b63ccb6c2 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 9 Jan 2002 16:28:27 +0000 Subject: [PATCH] Include glib-object.h, Add G_BEGIN_DECLS/END_DECLS to atk-enum-types.h. Wed Jan 9 11:26:56 2002 Owen Taylor * atk/Makefile.am (s-enum-types-h): Include glib-object.h, Add G_BEGIN_DECLS/END_DECLS to atk-enum-types.h. (#68325, Mikael Hermansson) --- ChangeLog | 6 ++++++ atk/Makefile.am | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07386f4..62a3806 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jan 9 11:26:56 2002 Owen Taylor + + * atk/Makefile.am (s-enum-types-h): Include glib-object.h, + Add G_BEGIN_DECLS/END_DECLS to atk-enum-types.h. (#68325, + Mikael Hermansson) + 2002-01-07 Padraig O'Briain * atk/atkcomponent.c (atk_component_add_focus_handler):1 diff --git a/atk/Makefile.am b/atk/Makefile.am index 349afb5..993cbe5 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -142,10 +142,10 @@ atk-enum-types.h: s-enum-types-h s-enum-types-h: @REBUILD@ $(atk_headers) Makefile ( cd $(srcdir) && glib-mkenums \ - --fhead "#ifndef __ATK_ENUM_TYPES_H__\n#define __ATK_ENUM_TYPES_H__\n" \ + --fhead "#ifndef __ATK_ENUM_TYPES_H__\n#define __ATK_ENUM_TYPES_H__\n\n#include \n\nG_BEGIN_DECLS\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \ --vhead "GType @enum_name@_get_type (void);\n#define ATK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "#endif /* __ATK_ENUM_TYPES_H__ */" \ + --ftail "G_END_DECLS\n\n#endif /* __ATK_ENUM_TYPES_H__ */" \ $(atk_headers) ) > tmp-atk-enum-types.h \ && (cmp -s tmp-atk-enum-types.h $(srcdir)/atk-enum-types.h || cp tmp-atk-enum-types.h $(srcdir)/atk-enum-types.h ) \ && rm -f tmp-atk-enum-types.h \ -- 2.7.4