From 62de531b4a47f4f9ef85b63c1e253efa23ecd3ef Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Wed, 12 Oct 2016 12:50:17 +0100
Subject: [PATCH] Forward declare C functions for GCC's sake

---
 src/interface/Cursors.cpp | 2 --
 src/interface/Cursors.h   | 9 ++++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/interface/Cursors.cpp b/src/interface/Cursors.cpp
index 75f3ff8899..60c069032b 100644
--- a/src/interface/Cursors.cpp
+++ b/src/interface/Cursors.cpp
@@ -23,8 +23,6 @@ namespace Cursors
     constexpr sint32 CURSOR_WIDTH = 32;
     constexpr sint32 CURSOR_HEIGHT = 32;
 
-    static const CursorData * RawCursorData[CURSOR_COUNT];
-
     static SDL_Cursor * _loadedCursors[CURSOR_COUNT];
     static bool         _initialised = false;
     static CURSOR_ID    _currentCursor = CURSOR_UNDEFINED;
diff --git a/src/interface/Cursors.h b/src/interface/Cursors.h
index 99ef9b7a95..bf1cdad5fb 100644
--- a/src/interface/Cursors.h
+++ b/src/interface/Cursors.h
@@ -74,11 +74,18 @@ namespace Cursors
     void        SetCurrentCursor(CURSOR_ID cursorId);
 }
 
-#else
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
 
     void    cursors_initialise();
     void    cursors_dispose();
     int     cursors_getcurrentcursor();
     void    cursors_setcurrentcursor(int cursorId);
 
+#ifdef __cplusplus
+}
 #endif