diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-01-09 16:26:13 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-01-09 16:26:13 +0000 |
| commit | 162c3a7674ce0f89b584859bb1a6050a4ee8679a (patch) | |
| tree | 28f6875a142fc7965e3a50666f98b77eed04e733 | |
| parent | 957f267bd9c5b1fa19eb0b99e2cd9e064ca6e0c0 (diff) | |
| download | pango-162c3a7674ce0f89b584859bb1a6050a4ee8679a.tar.gz | |
Include glib-object.h, Add G_BEGIN_DECLS/END_DECLS to pango-enum-types.h.
Wed Jan 9 11:23:31 2002 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (s-enum-types-h): Include glib-object.h,
Add G_BEGIN_DECLS/END_DECLS to pango-enum-types.h. (#68325,
Mikael Hermansson)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | pango/Makefile.am | 4 |
8 files changed, 44 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Wed Jan 9 11:23:31 2002 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (s-enum-types-h): Include glib-object.h, + Add G_BEGIN_DECLS/END_DECLS to pango-enum-types.h. (#68325, + Mikael Hermansson) + Tue Jan 1 20:52:00 2002 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_merge[_static]): diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index a5d46a67..cfddaa82 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,9 @@ +Wed Jan 9 11:23:31 2002 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (s-enum-types-h): Include glib-object.h, + Add G_BEGIN_DECLS/END_DECLS to pango-enum-types.h. (#68325, + Mikael Hermansson) + Tue Jan 1 20:52:00 2002 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_merge[_static]): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index a5d46a67..cfddaa82 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Wed Jan 9 11:23:31 2002 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (s-enum-types-h): Include glib-object.h, + Add G_BEGIN_DECLS/END_DECLS to pango-enum-types.h. (#68325, + Mikael Hermansson) + Tue Jan 1 20:52:00 2002 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_merge[_static]): diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index a5d46a67..cfddaa82 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,9 @@ +Wed Jan 9 11:23:31 2002 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (s-enum-types-h): Include glib-object.h, + Add G_BEGIN_DECLS/END_DECLS to pango-enum-types.h. (#68325, + Mikael Hermansson) + Tue Jan 1 20:52:00 2002 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_merge[_static]): diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index a5d46a67..cfddaa82 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Wed Jan 9 11:23:31 2002 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (s-enum-types-h): Include glib-object.h, + Add G_BEGIN_DECLS/END_DECLS to pango-enum-types.h. (#68325, + Mikael Hermansson) + Tue Jan 1 20:52:00 2002 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_merge[_static]): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index a5d46a67..cfddaa82 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Wed Jan 9 11:23:31 2002 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (s-enum-types-h): Include glib-object.h, + Add G_BEGIN_DECLS/END_DECLS to pango-enum-types.h. (#68325, + Mikael Hermansson) + Tue Jan 1 20:52:00 2002 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_merge[_static]): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index a5d46a67..cfddaa82 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Wed Jan 9 11:23:31 2002 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (s-enum-types-h): Include glib-object.h, + Add G_BEGIN_DECLS/END_DECLS to pango-enum-types.h. (#68325, + Mikael Hermansson) + Tue Jan 1 20:52:00 2002 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_merge[_static]): diff --git a/pango/Makefile.am b/pango/Makefile.am index 1a9a9754..87f58c57 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -229,10 +229,10 @@ pango-enum-types.h: s-enum-types-h s-enum-types-h: @REBUILD@ $(pango_headers) Makefile ( cd $(srcdir) && glib-mkenums \ - --fhead "#ifndef __PANGO_ENUM_TYPES_H__\n#define __PANGO_ENUM_TYPES_H__\n" \ + --fhead "#ifndef __PANGO_ENUM_TYPES_H__\n#define __PANGO_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \ --vhead "GType @enum_name@_get_type (void);\n#define PANGO_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "#endif /* __PANGO_ENUM_TYPES_H__ */" \ + --ftail "G_END_DECLS\n\n#endif /* __PANGO_ENUM_TYPES_H__ */" \ $(pango_headers) ) > tmp-pango-enum-types.h \ && (cmp -s tmp-pango-enum-types.h $(srcdir)/pango-enum-types.h || cp tmp-pango-enum-types.h $(srcdir)/pango-enum-types.h ) \ && rm -f tmp-pango-enum-types.h \ |