[goocanvas/prep-msvc-3.0] src/goocanvasatk.*: Fix autotools linker error
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goocanvas/prep-msvc-3.0] src/goocanvasatk.*: Fix autotools linker error
- Date: Sat, 12 Jun 2021 04:35:43 +0000 (UTC)
commit d2c851a574d42c117b6311f2bc2473c666aa3609
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Sat Jun 12 12:34:29 2021 +0800
src/goocanvasatk.*: Fix autotools linker error
Apparently the GNU linker does not like us including goocanvasatk.h in
goocanvasatk.c, so work around things by adding prototypes in goocanvasatk.c
instead
src/goocanvasatk.c | 10 +++++++++-
src/goocanvasatk.h | 4 ----
2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/src/goocanvasatk.c b/src/goocanvasatk.c
index abdbe41..fa30eeb 100644
--- a/src/goocanvasatk.c
+++ b/src/goocanvasatk.c
@@ -11,7 +11,15 @@
#include <math.h>
#include <gtk/gtk.h>
#include "goocanvas.h"
-#include "goocanvasatk.h"
+
+#ifdef _MSC_VER
+GOOCANVAS_API
+GType goo_canvas_accessible_factory_get_type (void) G_GNUC_CONST;
+GOOCANVAS_API
+GType goo_canvas_item_accessible_factory_get_type (void) G_GNUC_CONST;
+GOOCANVAS_API
+GType goo_canvas_widget_accessible_factory_get_type (void) G_GNUC_CONST;
+#endif
/*
diff --git a/src/goocanvasatk.h b/src/goocanvasatk.h
index ee83ebb..bb1eae8 100644
--- a/src/goocanvasatk.h
+++ b/src/goocanvasatk.h
@@ -8,15 +8,11 @@
#define __GOO_CANVAS_ATK_H__
#include <gtk/gtk.h>
-#include "goocanvasexports.h"
G_BEGIN_DECLS
-GOOCANVAS_API
GType goo_canvas_accessible_factory_get_type (void) G_GNUC_CONST;
-GOOCANVAS_API
GType goo_canvas_item_accessible_factory_get_type (void) G_GNUC_CONST;
-GOOCANVAS_API
GType goo_canvas_widget_accessible_factory_get_type (void) G_GNUC_CONST;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]