diff options
| author | Littleboy | 2011-06-22 20:52:59 -0400 |
|---|---|---|
| committer | Littleboy | 2011-06-22 20:52:59 -0400 |
| commit | 2b01778e58db8f843d3cd29756f8f710a02d7306 (patch) | |
| tree | 8abe64bb5b44502bef6ec61972ee624d6be3904f | |
| parent | d9ede873d5043cc6c389afdcb6ec403cb9655a9a (diff) | |
| download | scummvm-rg350-2b01778e58db8f843d3cd29756f8f710a02d7306.tar.gz scummvm-rg350-2b01778e58db8f843d3cd29756f8f710a02d7306.tar.bz2 scummvm-rg350-2b01778e58db8f843d3cd29756f8f710a02d7306.zip | |
BACKENDS: Fix compilation with Unity
- Replace UNIX by POSIX
- Move unity include to cpp file
- Add exception for unistd.h and time.h headers
| -rw-r--r-- | backends/taskbar/unity/unity-taskbar.cpp | 6 | ||||
| -rw-r--r-- | backends/taskbar/unity/unity-taskbar.h | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/backends/taskbar/unity/unity-taskbar.cpp b/backends/taskbar/unity/unity-taskbar.cpp index 49c56b746d..da053734d2 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 9f14b44d8f..06ea0ca769 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: |