Rename variable in FSList::sort() to avoid conflict with system defines

svn-id: r21612

2 files changed, 5 insertions, 7 deletions

diff --git a/backends/fs/fs.cpp b/backends/fs/fs.cpp
index df4a76bf07..4cc0432638 100644
--- a/backends/fs/fs.cpp
+++ b/backends/fs/fs.cpp
@@ -27,14 +27,14 @@
 void FSList::sort() {
 	// Simple selection sort
 	for (iterator i = begin(); i != end(); ++i) {
-		iterator min(i);
+		iterator m(i);
 		iterator j(i);
 		++j;
 		for (; j != end(); ++j)
-			if (*j < *min)
-				min = j;
-		if (min != i)
-			SWAP(*min, *i);
+			if (*j < *m)
+				m = j;
+		if (m != i)
+			SWAP(*m, *i);
 	}
 }
 
diff --git a/backends/fs/windows/windows-fs.cpp b/backends/fs/windows/windows-fs.cpp
index 556d839496..a238481cd6 100644
--- a/backends/fs/windows/windows-fs.cpp
+++ b/backends/fs/windows/windows-fs.cpp
@@ -143,8 +143,6 @@ WindowsFilesystemNode::WindowsFilesystemNode() {
 }
 
 WindowsFilesystemNode::WindowsFilesystemNode(const String &p) {
-	int len = 0, offset = p.size();
-
 	assert(p.size() > 0);
 
 	_path = p;