mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Re-add platform-specific headers and fix prototypes.

Browse source 
Originally committed to SVN as r5141.
This commit is contained in:
Amar Takhar 2011-01-08 15:24:35 +00:00
parent 9d5a2b41b5
commit c67fe6db5d
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
aegisub/reporter/platform.cpp
View file

@ -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__

6
aegisub/reporter/platform_unix_linux.h
View file

@ -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();

6
aegisub/reporter/platform_unix_osx.h
View file

@ -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();

8
aegisub/reporter/platform_windows.h
View file

@ -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();