From 013ce5b70e85d6c9008cebd1d5efbe87a539d445 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 28 Jan 2010 12:31:13 +0530 Subject: Without this evo 2.28.2 will not link/run at all The change is needed: 1) To export the right symbols from the right dummy import library so that the loader does not look for symbols where they are not 2) Export that comp_editor_registry using a getter function for win32 so that we don't have to decorate the data string so that the autoexport works again --- calendar/gui/cal-editor-utils.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'calendar/gui/cal-editor-utils.c') diff --git a/calendar/gui/cal-editor-utils.c b/calendar/gui/cal-editor-utils.c index 4258e2ce01..d4389aa928 100644 --- a/calendar/gui/cal-editor-utils.c +++ b/calendar/gui/cal-editor-utils.c @@ -30,6 +30,16 @@ #include "dialogs/task-editor.h" #include "dialogs/memo-editor.h" +<<<<<<< HEAD +======= +#ifdef G_OS_WIN32 +const ECompEditorRegistry * const comp_editor_get_registry(); +#define comp_editor_registry comp_editor_get_registry() +#else +extern ECompEditorRegistry *comp_editor_registry; +#endif + +>>>>>>> 90cd900... Without this evo 2.28.2 will not link/run at all /** * open_component_editor: * @client: Already opened #ECal, where to store the component -- cgit