2001-11-20 Michael Meeks <michael@ximian.com>

[platform/core/uifw/at-spi2-atk.git] / libspi / accessible.h

diff --git a/libspi/accessible.h b/libspi/accessible.h
index 4050eb6..9d85556 100644 (file)
--- a/libspi/accessible.h
+++ b/libspi/accessible.h
@@ -20,15 +20,13 @@
 #ifndef SPI_ACCESSIBLE_H_
 #define SPI_ACCESSIBLE_H_
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+#include <glib/gmacros.h>
 #include <bonobo/bonobo-object.h>
 #include <atk/atkobject.h>
 #include <libspi/Accessibility.h>
 
+G_BEGIN_DECLS
+
 #define SPI_ACCESSIBLE_TYPE        (spi_accessible_get_type ())
 #define SPI_ACCESSIBLE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_ACCESSIBLE_TYPE, SpiAccessible))
 #define SPI_ACCESSIBLE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), SPI_ACCESSIBLE_TYPE, SpiAccessibleClass))
@@ -45,12 +43,10 @@ typedef struct {
         POA_Accessibility_Accessible__epv epv;
 } SpiAccessibleClass;
 
-GType                  spi_accessible_get_type   (void);
-SpiAccessible             *spi_accessible_new       (AtkObject *o);
+GType          spi_accessible_get_type (void);
+SpiAccessible *spi_accessible_new      (AtkObject *o);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* SPI_ACCESSIBLE_H_ */