add G_DISABLE_SINGLE_INCLUDES and ATK_DISABLE_SINGLE_INCLUDES to CPPFLAGS.

[platform/upstream/atk.git] / atk / atkobject.h

diff --git a/atk/atkobject.h b/atk/atkobject.h
index bb9b55a..39499e7 100755 (executable)
--- 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__ */