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/atkregistry.h | |
| parent | d35b90785a586b1f075414b44e975f26cca33855 (diff) | |
| download | at-spi2-core-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/atkregistry.h')
| -rw-r--r-- | atk/atkregistry.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/atk/atkregistry.h b/atk/atkregistry.h index 3ab0414a..eb164039 100644 --- a/atk/atkregistry.h +++ b/atk/atkregistry.h @@ -17,16 +17,18 @@ * 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_REGISTRY_H__ #define __ATK_REGISTRY_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include <glib-object.h> #include "atkobjectfactory.h" +G_BEGIN_DECLS + #define ATK_TYPE_REGISTRY (atk_registry_get_type ()) #define ATK_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_REGISTRY, AtkRegistry)) #define ATK_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_REGISTRY, AtkRegistryClass)) @@ -61,9 +63,7 @@ AtkObjectFactory* atk_registry_get_factory (AtkRegistry *registry, AtkRegistry* atk_get_default_registry (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __ATK_REGISTRY_H__ */ |