diff options
author | Tor Lillqvist <tml@iki.fi> | 2009-11-08 03:09:34 +0800 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2009-11-08 03:17:12 +0800 |
commit | 9b2dfe803246ebf0ebd1e5699b360384546036fa (patch) | |
tree | fa21f9ce4ea8e45caebbcfe99b6fae07133c6738 | |
parent | 31879270299ab44de623c0b065fc715114ddd492 (diff) | |
download | gsoc2013-evolution-9b2dfe803246ebf0ebd1e5699b360384546036fa.tar gsoc2013-evolution-9b2dfe803246ebf0ebd1e5699b360384546036fa.tar.gz gsoc2013-evolution-9b2dfe803246ebf0ebd1e5699b360384546036fa.tar.bz2 gsoc2013-evolution-9b2dfe803246ebf0ebd1e5699b360384546036fa.tar.lz gsoc2013-evolution-9b2dfe803246ebf0ebd1e5699b360384546036fa.tar.xz gsoc2013-evolution-9b2dfe803246ebf0ebd1e5699b360384546036fa.tar.zst gsoc2013-evolution-9b2dfe803246ebf0ebd1e5699b360384546036fa.zip |
Explicitly dllimport/export comp_editor_registry on Windows
Fixes build on Windows. Having variables in the API of a shared
library can be painful on Windows. The GNU tool-chain's ("MinGW")
auto-import feature usually works fine, but occasionally one needs to
explicitly decorate the variable definition with dllexport and extern
declarations with dllimport. I don't know why this is now necessary
for comp_editor_registry (it wasn't earlier). Something must have
changed slightly in the newer MinGW tool-chain versions.
-rw-r--r-- | calendar/gui/cal-editor-utils.c | 3 | ||||
-rw-r--r-- | calendar/gui/calendar-component.c | 3 | ||||
-rw-r--r-- | calendar/gui/comp-editor-factory.c | 3 | ||||
-rw-r--r-- | calendar/gui/e-calendar-table.c | 3 | ||||
-rw-r--r-- | calendar/gui/e-calendar-view.c | 3 | ||||
-rw-r--r-- | calendar/gui/e-memo-table.c | 3 | ||||
-rw-r--r-- | calendar/gui/main.c | 3 | ||||
-rw-r--r-- | calendar/gui/memos-component.c | 3 | ||||
-rw-r--r-- | calendar/gui/tasks-component.c | 3 |
9 files changed, 27 insertions, 0 deletions
diff --git a/calendar/gui/cal-editor-utils.c b/calendar/gui/cal-editor-utils.c index ece9abe532..683cfff0f5 100644 --- a/calendar/gui/cal-editor-utils.c +++ b/calendar/gui/cal-editor-utils.c @@ -31,6 +31,9 @@ #include "dialogs/task-editor.h" #include "dialogs/memo-editor.h" +#ifdef G_OS_WIN32 +__declspec(dllimport) +#endif extern ECompEditorRegistry *comp_editor_registry; /** diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 625321a934..ec35fa8a0c 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -137,6 +137,9 @@ struct _CalendarComponentPrivate { }; /* FIXME This should be gnome cal likely */ +#ifdef G_OS_WIN32 +__declspec(dllimport) +#endif extern ECompEditorRegistry *comp_editor_registry; static void diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c index ee80a00ae5..0118085099 100644 --- a/calendar/gui/comp-editor-factory.c +++ b/calendar/gui/comp-editor-factory.c @@ -40,6 +40,9 @@ #include "dialogs/event-editor.h" #include "dialogs/task-editor.h" +#ifdef G_OS_WIN32 +__declspec(dllimport) +#endif extern ECompEditorRegistry *comp_editor_registry; diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index 3097dd377d..ab04dbcdbe 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -77,6 +77,9 @@ static GtkTargetEntry target_types[] = { static guint n_target_types = G_N_ELEMENTS (target_types); +#ifdef G_OS_WIN32 +__declspec(dllimport) +#endif extern ECompEditorRegistry *comp_editor_registry; static void e_calendar_table_destroy (GtkObject *object); diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 286db6b5f1..3507643f63 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -81,6 +81,9 @@ static void e_calendar_view_get_property (GObject *object, guint property_id, GV static void e_calendar_view_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); static void e_calendar_view_destroy (GtkObject *object); +#ifdef G_OS_WIN32 +__declspec(dllimport) +#endif extern ECompEditorRegistry *comp_editor_registry; /* Property IDs */ diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 50158899ac..b843adcb87 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -71,6 +71,9 @@ static GtkTargetEntry target_types[] = { static guint n_target_types = G_N_ELEMENTS (target_types); +#ifdef G_OS_WIN32 +__declspec(dllimport) +#endif extern ECompEditorRegistry *comp_editor_registry; static void e_memo_table_destroy (GtkObject *object); diff --git a/calendar/gui/main.c b/calendar/gui/main.c index 9d078edbd9..ffdebcee94 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -62,6 +62,9 @@ #define CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_Calendar_ConfigControl:" BASE_VERSION #define COMP_EDITOR_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:" BASE_VERSION +#ifdef G_OS_WIN32 +__declspec(dllexport) +#endif ECompEditorRegistry *comp_editor_registry = NULL; /* The component editor factory */ diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index f4e3200e8c..a427b224ca 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -77,6 +77,9 @@ static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]); static BonoboObjectClass *parent_class = NULL; /* Memos should have their own registry */ +#ifdef G_OS_WIN32 +__declspec(dllimport) +#endif extern ECompEditorRegistry *comp_editor_registry; typedef struct _MemosComponentView diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index f7934742d2..44d73798be 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -76,6 +76,9 @@ static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]); static BonoboObjectClass *parent_class = NULL; /* Tasks should have their own registry */ +#ifdef G_OS_WIN32 +__declspec(dllimport) +#endif extern ECompEditorRegistry *comp_editor_registry; typedef struct |