From ad005c3a9ca6359cc1b036ec7aeb241c7dfdda0d Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sat, 22 May 2010 01:38:07 +0000
Subject: [PATCH] Split unix/windows code into seperate files to preserve
 sanity.

Originally committed to SVN as r4343.
---
 aegisub/tests/Makefile.am      |  1 +
 aegisub/tests/util.cpp         | 14 ++------------
 aegisub/tests/util.h           |  1 +
 aegisub/tests/util_unix.cpp    | 31 +++++++++++++++++++++++++++++++
 aegisub/tests/util_windows.cpp | 32 ++++++++++++++++++++++++++++++++
 5 files changed, 67 insertions(+), 12 deletions(-)
 create mode 100644 aegisub/tests/util_unix.cpp
 create mode 100644 aegisub/tests/util_windows.cpp

diff --git a/aegisub/tests/Makefile.am b/aegisub/tests/Makefile.am
index f15228a92..f5412fb18 100644
--- a/aegisub/tests/Makefile.am
+++ b/aegisub/tests/Makefile.am
@@ -9,6 +9,7 @@ run_CPPFLAGS= -I../src/include -I../libaegisub/include
 run_SOURCES = \
 		main.cpp \
 		util.cpp \
+		util_unix.cpp \
 		libaegisub_access.cpp \
 		libaegisub_cajun.cpp \
 		libaegisub_util.cpp \
diff --git a/aegisub/tests/util.cpp b/aegisub/tests/util.cpp
index 5dc47ae95..f6902f130 100644
--- a/aegisub/tests/util.cpp
+++ b/aegisub/tests/util.cpp
@@ -16,16 +16,10 @@
 
 /// @file util.cpp
 /// @brief Common utilities used in tests.
-/// @ingroup util
+/// @ingroup util common
 
-#ifdef _WIN32
-#include <io.h>
-#define UNLINK _unlink
-#else
-#include <unistd.h>
-#define UNLINK unlink
-#endif
 #include <fstream>
+#include "util.h"
 
 namespace util {
 
@@ -36,10 +30,6 @@ void copy(const std::string from, const std::string to) {
 	ofs << ifs.rdbuf();
 }
 
-void remove(const std::string& file) {
-	UNLINK(file.c_str());
-}
-
 } // namespace util
 
 
diff --git a/aegisub/tests/util.h b/aegisub/tests/util.h
index f57856edc..9d7b1625b 100644
--- a/aegisub/tests/util.h
+++ b/aegisub/tests/util.h
@@ -18,6 +18,7 @@
 /// @brief Common utilities used in tests.
 /// @ingroup util
 
+#include <string>
 namespace util {
 
 void copy(const std::string from, const std::string to);
diff --git a/aegisub/tests/util_unix.cpp b/aegisub/tests/util_unix.cpp
new file mode 100644
index 000000000..0bb2cfd61
--- /dev/null
+++ b/aegisub/tests/util_unix.cpp
@@ -0,0 +1,31 @@
+// Copyright (c) 2010, Amar Takhar <verm@aegisub.org>
+//
+// Permission to use, copy, modify, and distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// $Id$
+
+/// @file util_unix.cpp
+/// @brief Common utilities used in tests.
+/// @ingroup util unix
+
+#include <unistd.h>
+#include "util.h"
+
+namespace util {
+
+void remove(const std::string& file) {
+	unlink(file.c_str());
+}
+
+} // namespace util
+
diff --git a/aegisub/tests/util_windows.cpp b/aegisub/tests/util_windows.cpp
new file mode 100644
index 000000000..e5c3bf524
--- /dev/null
+++ b/aegisub/tests/util_windows.cpp
@@ -0,0 +1,32 @@
+// Copyright (c) 2010, Amar Takhar <verm@aegisub.org>
+//
+// Permission to use, copy, modify, and distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// $Id$
+
+/// @file util_windows.cpp
+/// @brief Common utilities used in tests.
+/// @ingroup util windows
+
+#include <io.h>
+#include "util.sh"
+
+namespace util {
+
+void remove(const std::string& file) {
+	_unlink(file.c_str());
+}
+
+} // namespace util
+
+