From 69b1485a22dc2b8a2cfe0bd10edcbaad0da0cf6e Mon Sep 17 00:00:00 2001
From: strangerke
Date: Thu, 12 May 2011 01:13:57 +0200
Subject: GIT: Clean up: Suppress SVN tags, now useless

---
 backends/base-backend.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'backends/base-backend.cpp')

diff --git a/backends/base-backend.cpp b/backends/base-backend.cpp
index f349cc8005..68ec5efe62 100644
--- a/backends/base-backend.cpp
+++ b/backends/base-backend.cpp
@@ -18,9 +18,6 @@
  * 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$
- *
  */
 
 #include "backends/base-backend.h"
-- 
cgit v1.2.3


From 944e0be209f5ab47c3b903f258d2d41b990d80cb Mon Sep 17 00:00:00 2001
From: Pawel Kolodziejski
Date: Mon, 23 May 2011 18:11:40 +0200
Subject: SAMSUNGTV: update port

---
 backends/base-backend.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'backends/base-backend.cpp')

diff --git a/backends/base-backend.cpp b/backends/base-backend.cpp
index 68ec5efe62..f3935b5893 100644
--- a/backends/base-backend.cpp
+++ b/backends/base-backend.cpp
@@ -58,12 +58,8 @@ void BaseBackend::fillScreen(uint32 col) {
 
 
 #if defined(UNIX)
-#if defined(SAMSUNGTV)
-#define DEFAULT_CONFIG_FILE "/dtv/usb/sda1/.scummvmrc"
-#else
 #define DEFAULT_CONFIG_FILE ".scummvmrc"
 #endif
-#endif
 
 #if !defined(UNIX)
 #define DEFAULT_CONFIG_FILE "scummvm.ini"
-- 
cgit v1.2.3


From 39076ef9722529d80feff94bdff25843beb4fc13 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 5 May 2011 15:38:54 +0200
Subject: BUILD: Rename UNIX #define to POSIX

---
 backends/base-backend.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'backends/base-backend.cpp')

diff --git a/backends/base-backend.cpp b/backends/base-backend.cpp
index f3935b5893..624de1f3e5 100644
--- a/backends/base-backend.cpp
+++ b/backends/base-backend.cpp
@@ -18,6 +18,9 @@
  * 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$
+ *
  */
 
 #include "backends/base-backend.h"
@@ -57,11 +60,15 @@ void BaseBackend::fillScreen(uint32 col) {
 */
 
 
-#if defined(UNIX)
+#if defined(POSIX)
+#if defined(SAMSUNGTV)
+#define DEFAULT_CONFIG_FILE "/dtv/usb/sda1/.scummvmrc"
+#else
 #define DEFAULT_CONFIG_FILE ".scummvmrc"
 #endif
+#endif
 
-#if !defined(UNIX)
+#if !defined(POSIX)
 #define DEFAULT_CONFIG_FILE "scummvm.ini"
 #endif
 
-- 
cgit v1.2.3


From a87d33845a9e8253b876ef59d0b9b9fd45a9aaa4 Mon Sep 17 00:00:00 2001
From: Pawel Kolodziejski
Date: Wed, 25 May 2011 19:40:55 +0200
Subject: SAMSUNGTV: revert code of result some previous commit

---
 backends/base-backend.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'backends/base-backend.cpp')

diff --git a/backends/base-backend.cpp b/backends/base-backend.cpp
index 624de1f3e5..40e702495a 100644
--- a/backends/base-backend.cpp
+++ b/backends/base-backend.cpp
@@ -61,12 +61,8 @@ void BaseBackend::fillScreen(uint32 col) {
 
 
 #if defined(POSIX)
-#if defined(SAMSUNGTV)
-#define DEFAULT_CONFIG_FILE "/dtv/usb/sda1/.scummvmrc"
-#else
 #define DEFAULT_CONFIG_FILE ".scummvmrc"
 #endif
-#endif
 
 #if !defined(POSIX)
 #define DEFAULT_CONFIG_FILE "scummvm.ini"
-- 
cgit v1.2.3