From 2b01778e58db8f843d3cd29756f8f710a02d7306 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Wed, 22 Jun 2011 20:52:59 -0400
Subject: BACKENDS: Fix compilation with Unity

 - Replace UNIX by POSIX
 - Move unity include to cpp file
 - Add exception for unistd.h and time.h headers
---
 backends/taskbar/unity/unity-taskbar.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'backends/taskbar/unity/unity-taskbar.cpp')

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();
 
-- 
cgit v1.2.3


From 2fa17c44edf07f4f82147a6070950e7d8f7ee2f4 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 5 Aug 2011 21:09:07 +0100
Subject: JANITORIAL: Remove SVN keywords

---
 backends/taskbar/unity/unity-taskbar.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'backends/taskbar/unity/unity-taskbar.cpp')

diff --git a/backends/taskbar/unity/unity-taskbar.cpp b/backends/taskbar/unity/unity-taskbar.cpp
index da053734d2..f36e2bf628 100644
--- a/backends/taskbar/unity/unity-taskbar.cpp
+++ b/backends/taskbar/unity/unity-taskbar.cpp
@@ -8,19 +8,16 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
-- 
cgit v1.2.3