diff options
| author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2010-01-28 15:01:13 +0800 |
|---|---|---|
| committer | Fridrich Strba <fridrich.strba@bluewin.ch> | 2010-01-28 21:48:36 +0800 |
| commit | 013ce5b70e85d6c9008cebd1d5efbe87a539d445 (patch) | |
| tree | 220c399960ff4583071c14097e10389e42c5db59 /calendar/gui/cal-editor-utils.c | |
| parent | 8bbc48cd7792901c406cf8f773372508677ceb93 (diff) | |
| download | gsoc2013-evolution-013ce5b70e85d6c9008cebd1d5efbe87a539d445.tar.gz gsoc2013-evolution-013ce5b70e85d6c9008cebd1d5efbe87a539d445.tar.zst gsoc2013-evolution-013ce5b70e85d6c9008cebd1d5efbe87a539d445.zip | |
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
Diffstat (limited to 'calendar/gui/cal-editor-utils.c')
| -rw-r--r-- | calendar/gui/cal-editor-utils.c | 10 |
1 files changed, 10 insertions, 0 deletions
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 |