From 521b6f544e23dc43028b938e0c3d6e1618acdd7a Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Thu, 5 Jun 2008 09:03:47 +0000 Subject: add G_DISABLE_SINGLE_INCLUDES and ATK_DISABLE_SINGLE_INCLUDES to CPPFLAGS. 2008-06-05 Michael Natterer * 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 --- atk/atkrelationtype.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'atk/atkrelationtype.h') diff --git a/atk/atkrelationtype.h b/atk/atkrelationtype.h index 665c675..ad34bfc 100755 --- a/atk/atkrelationtype.h +++ b/atk/atkrelationtype.h @@ -17,12 +17,16 @@ * Boston, MA 02111-1307, USA. */ +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __ATK_RELATION_TYPE_H__ #define __ATK_RELATION_TYPE_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +#include + +G_BEGIN_DECLS /** *AtkRelationType: @@ -72,8 +76,6 @@ typedef enum ATK_RELATION_LAST_DEFINED } AtkRelationType; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __ATK_RELATION_TYPE_H__ */ -- cgit v1.2.1