blob: ad49b6aa3a76436ac0f6b8e8fa14eaf0889b4b81 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
diff -dPNur navit-9999/navit/gui/cegui/gui_sdl.h navit-9999-ds/navit/gui/cegui/gui_sdl.h
--- navit-9999/navit/gui/cegui/gui_sdl.h 2008-11-16 04:33:38.000000000 +0100
+++ navit-9999-ds/navit/gui/cegui/gui_sdl.h 2008-11-16 04:04:55.000000000 +0100
@@ -29,8 +29,10 @@
extern struct navit *sdl_gui_navit;
+extern "C" {
bool BookmarkGo(const char * name);
bool FormerDestGo(const char * name);
+}
struct gui_priv {
struct navit *nav;
diff -dPNur navit-9999/navit/gui/cegui/gui_sdl_window.cpp navit-9999-ds/navit/gui/cegui/gui_sdl_window.cpp
--- navit-9999/navit/gui/cegui/gui_sdl_window.cpp 2008-11-16 04:33:38.000000000 +0100
+++ navit-9999-ds/navit/gui/cegui/gui_sdl_window.cpp 2008-11-16 04:03:25.000000000 +0100
@@ -24,6 +24,7 @@
// FIXME temporary fix for enum
#include "projection.h"
+extern "C" {
#include "item.h"
#include "navit.h"
#include "vehicle.h"
@@ -43,7 +44,7 @@
#include "track.h"
#include "menu.h"
#include "map.h"
-
+}
#include "CEGUI.h"
|
