add G_DISABLE_SINGLE_INCLUDES and ATK_DISABLE_SINGLE_INCLUDES to CPPFLAGS.

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

diff --git a/atk/atktable.h b/atk/atktable.h
index 790fbb4..909b508 100755 (executable)
--- a/atk/atktable.h
+++ b/atk/atktable.h
@@ -17,14 +17,16 @@
  * 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_TABLE_H__
 #define __ATK_TABLE_H__
 
 #include <atk/atkobject.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * AtkTable describes a user-interface component that presents data in
@@ -210,9 +212,6 @@ gboolean          atk_table_remove_column_selection
                                                  (AtkTable         *table,
                                                   gint             column);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_TABLE_H__ */