[Scummvm-cvs-logs] scummvm master -> 2b01778e58db8f843d3cd29756f8f710a02d7306

[Littleboy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2b01778e58 BACKENDS: Fix compilation with Unity


Commit: 2b01778e58db8f843d3cd29756f8f710a02d7306
    https://github.com/scummvm/scummvm/commit/2b01778e58db8f843d3cd29756f8f710a02d7306
Author: Littleboy (littleboy at users.sourceforge.net)
Date: 2011-06-22T17:52:59-07:00

Commit Message:
BACKENDS: Fix compilation with Unity

 - Replace UNIX by POSIX
 - Move unity include to cpp file
 - Add exception for unistd.h and time.h headers

Changed paths:
    backends/taskbar/unity/unity-taskbar.cpp
    backends/taskbar/unity/unity-taskbar.h



diff --git a/backends/taskbar/unity/unity-taskbar.cpp b/backends/taskbar/unity/unity-taskbar.cpp
index 49c56b7..da05373 100644
--- 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
index 9f14b44..06ea0ca 100644
--- 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: