diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-06-05 09:03:47 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-06-05 09:03:47 +0000 |
| commit | 521b6f544e23dc43028b938e0c3d6e1618acdd7a (patch) | |
| tree | 4dcc37fea45d3d62d6c756b56d553405d4ed792b /atk/atkobject.h | |
| parent | d35b90785a586b1f075414b44e975f26cca33855 (diff) | |
| download | atk-521b6f544e23dc43028b938e0c3d6e1618acdd7a.tar.gz | |
add G_DISABLE_SINGLE_INCLUDES and ATK_DISABLE_SINGLE_INCLUDES to CPPFLAGS.
2008-06-05 Michael Natterer <mitch@imendio.com>
* configure.in: add G_DISABLE_SINGLE_INCLUDES and
ATK_DISABLE_SINGLE_INCLUDES to CPPFLAGS.
* atk/atk.h: define __ATK_H_INSIDE__ around including all other
headers.
* atk/atk*.h: add single-include guards that #error out if
ATK_DISABLE_SINGLE_INCLUDES is defined and any of these files is
included individually. Use G_BEGIN_DECLS/G_END_DECLS in all files.
* atk/Makefile.am: define ATK_COMPILATION while building ATK.
Add single-include guards to the generated atk-enum-types.h too.
svn path=/trunk/; revision=1246
Diffstat (limited to 'atk/atkobject.h')
| -rwxr-xr-x | atk/atkobject.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/atk/atkobject.h b/atk/atkobject.h index bb9b55a..39499e7 100755 --- a/atk/atkobject.h +++ b/atk/atkobject.h @@ -17,17 +17,19 @@ * Boston, MA 02111-1307, USA. */ +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#error "Only <atk/atk.h> can be included directly." +#endif + #ifndef __ATK_OBJECT_H__ #define __ATK_OBJECT_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include <glib-object.h> #include <atk/atkstate.h> #include <atk/atkrelationtype.h> +G_BEGIN_DECLS + /* * AtkObject represents the minimum information all accessible objects * return. This information includes accessible name, accessible @@ -640,9 +642,6 @@ G_CONST_RETURN gchar* atk_role_get_localized_name (AtkRole role * cpos = atk_text_get_caret_position (ATK_TEXT (accessible)); */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __ATK_OBJECT_H__ */ |