BACKENDS: Fix compilation with Unity

- Replace UNIX by POSIX - Move unity include to cpp file - Add exception for unistd.h and time.h headers
scummvm · Jun 23, 2011 · 2b01778 · 2b01778
1 parent d9ede87
commit 2b01778
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/backends/taskbar/unity/unity-taskbar.cpp b/backends/taskbar/unity/unity-taskbar.cpp
@@ -23,14 +23,18 @@
  *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
 #include "common/scummsys.h"
 
-#if defined(UNIX) && defined(USE_TASKBAR) && defined(USE_TASKBAR_UNITY)
+#if defined(POSIX) && defined(USE_TASKBAR) && defined(USE_TASKBAR_UNITY)
 
 #include "backends/taskbar/unity/unity-taskbar.h"
 
 #include "common/textconsole.h"
 
+#include <unity.h>
+
 UnityTaskbarManager::UnityTaskbarManager() {
 	g_type_init();
 

diff --git a/backends/taskbar/unity/unity-taskbar.h b/backends/taskbar/unity/unity-taskbar.h
@@ -26,13 +26,14 @@
 #ifndef BACKEND_UNITY_TASKBAR_H
 #define BACKEND_UNITY_TASKBAR_H
 
-#if defined(UNIX) && defined(USE_TASKBAR) && defined(USE_TASKBAR_UNITY)
+#if defined(POSIX) && defined(USE_TASKBAR) && defined(USE_TASKBAR_UNITY)
 
 #include "common/events.h"
 #include "common/str.h"
 #include "common/taskbar.h"
 
-#include <unity.h>
+typedef struct _GMainLoop GMainLoop;
+typedef struct _UnityLauncherEntry UnityLauncherEntry;
 
 class UnityTaskbarManager : public Common::TaskbarManager, public Common::EventSource {
 public: