From 62fbc8fb21e850a31efe0b7a4e211145813f7337 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sun, 17 Jun 2012 21:24:00 +0100 Subject: [PATCH] Make extern the globals in introspection.h To fix duplicate symbol _spi_org_a11y_atspi_Accessible in ../atk-adaptor/adaptors/.libs/libatk-bridge-adaptors.a(libatk_bridge_adaptors_la-accessible-adaptor.o) and .libs/libatk_bridge_2_0_la-introspection.o --- atk-adaptor/introspection.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/atk-adaptor/introspection.h b/atk-adaptor/introspection.h index 8ebd641..5392870 100644 --- a/atk-adaptor/introspection.h +++ b/atk-adaptor/introspection.h @@ -13,39 +13,39 @@ #define SPI_INTROSPECTION_DATA_H_ -const char *spi_org_a11y_atspi_Accessible; +extern const char *spi_org_a11y_atspi_Accessible; -const char *spi_org_a11y_atspi_Action; +extern const char *spi_org_a11y_atspi_Action; -const char *spi_org_a11y_atspi_Application; +extern const char *spi_org_a11y_atspi_Application; -const char *spi_org_a11y_atspi_Collection; +extern const char *spi_org_a11y_atspi_Collection; -const char *spi_org_a11y_atspi_Component; +extern const char *spi_org_a11y_atspi_Component; -const char *spi_org_a11y_atspi_Document; +extern const char *spi_org_a11y_atspi_Document; -const char *spi_org_a11y_atspi_Hypertext; +extern const char *spi_org_a11y_atspi_Hypertext; -const char *spi_org_a11y_atspi_Hyperlink; +extern const char *spi_org_a11y_atspi_Hyperlink; -const char *spi_org_a11y_atspi_Image; +extern const char *spi_org_a11y_atspi_Image; -const char *spi_org_a11y_atspi_Selection; +extern const char *spi_org_a11y_atspi_Selection; -const char *spi_org_a11y_atspi_Table; +extern const char *spi_org_a11y_atspi_Table; -const char *spi_org_a11y_atspi_Text; +extern const char *spi_org_a11y_atspi_Text; -const char *spi_org_a11y_atspi_EditableText; +extern const char *spi_org_a11y_atspi_EditableText; -const char *spi_org_a11y_atspi_Cache; +extern const char *spi_org_a11y_atspi_Cache; -const char *spi_org_a11y_atspi_Value; +extern const char *spi_org_a11y_atspi_Value; -const char *spi_org_a11y_atspi_DeviceEventController; +extern const char *spi_org_a11y_atspi_DeviceEventController; -const char *spi_org_a11y_atspi_DeviceEventListener; +extern const char *spi_org_a11y_atspi_DeviceEventListener; #endif /* SPI_INTROSPECTION_DATA_H_ */ -- 2.7.4