From c67fe6db5d0c9491247d716d134af546eb9f6807 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sat, 8 Jan 2011 15:24:35 +0000
Subject: [PATCH] Re-add platform-specific headers and fix prototypes.

Originally committed to SVN as r5141.
---
 aegisub/reporter/platform.cpp          | 6 +++---
 aegisub/reporter/platform_unix_linux.h | 6 +++---
 aegisub/reporter/platform_unix_osx.h   | 6 +++---
 aegisub/reporter/platform_windows.h    | 8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/aegisub/reporter/platform.cpp b/aegisub/reporter/platform.cpp
index ed1316e93..d6c63d88a 100644
--- a/aegisub/reporter/platform.cpp
+++ b/aegisub/reporter/platform.cpp
@@ -29,11 +29,11 @@
 #endif
 
 #include "include/platform.h"
-//#include "platform_windows.h"
+#include "platform_windows.h"
 #include "platform_unix.h"
 #include "platform_unix_bsd.h"
-//#include "platform_unix_linux.h"
-//#include "platform_unix_osx.h"
+#include "platform_unix_linux.h"
+#include "platform_unix_osx.h"
 
 extern "C" {
 #ifdef __WXMAC__
diff --git a/aegisub/reporter/platform_unix_linux.h b/aegisub/reporter/platform_unix_linux.h
index 7709dd26d..581e2a132 100644
--- a/aegisub/reporter/platform_unix_linux.h
+++ b/aegisub/reporter/platform_unix_linux.h
@@ -29,11 +29,11 @@ public:
 	// Hardware
 	virtual std::string CPUId();
 	virtual std::string CPUSpeed();
-	virtual std::string CPUCores();
-	virtual std::string CPUCount();
+	virtual int CPUCores();
+	virtual int CPUCount();
 	virtual std::string CPUFeatures();
 	virtual std::string CPUFeatures2();
-	virtual std::string Memory();
+	virtual uint64_t Memory();
 
 	// Unix Specific
 	virtual std::string UnixLibraries();
diff --git a/aegisub/reporter/platform_unix_osx.h b/aegisub/reporter/platform_unix_osx.h
index 6ddd6f019..daa26eab8 100644
--- a/aegisub/reporter/platform_unix_osx.h
+++ b/aegisub/reporter/platform_unix_osx.h
@@ -29,11 +29,11 @@ public:
 	// Hardware
 	virtual std::string CPUId();
 	virtual std::string CPUSpeed();
-	virtual std::string CPUCores();
-	virtual std::string CPUCount();
+	virtual int CPUCores();
+	virtual int CPUCount();
 	virtual std::string CPUFeatures();
 	virtual std::string CPUFeatures2();
-	virtual std::string Memory();
+	virtual uint64_t Memory();
 
 	virtual std::string PatchLevel();
 	virtual std::string QuickTimeExt();
diff --git a/aegisub/reporter/platform_windows.h b/aegisub/reporter/platform_windows.h
index dddc6d746..6826d4a1a 100644
--- a/aegisub/reporter/platform_windows.h
+++ b/aegisub/reporter/platform_windows.h
@@ -26,16 +26,16 @@ public:
 	PlatformWindows() {};
 	virtual ~PlatformWindows() {};
 	const std::string OSVersion();
-	std::string DesktopEnvironment();
+	const char* DesktopEnvironment();
 
 	// Hardware
 	virtual std::string CPUId();
 	virtual std::string CPUSpeed();
-	virtual std::string CPUCores();
-	virtual std::string CPUCount();
+	virtual int CPUCores();
+	virtual int CPUCount();
 	virtual std::string CPUFeatures();
 	virtual std::string CPUFeatures2();
-	virtual std::string Memory();
+	virtual uint64_t Memory();
 
 	// OpenGL
 	virtual std::string OpenGLVendor();