diff options
| author | XTra.KrazzY <XTra.KrazzY@gmail.com> | 2009-02-04 15:28:39 +0000 |
|---|---|---|
| committer | XTra.KrazzY <XTra.KrazzY@gmail.com> | 2009-02-04 15:28:39 +0000 |
| commit | 77215fd27ccb7cdeb82fed24a7a8d4d4ad4c33a4 (patch) | |
| tree | 66474d38e6c2ade00b700916d176ed7857cdf09b /Source/Core/Common | |
| parent | c43d8e9dcd1e08acf1b2287c4b64f5a9f31c8fab (diff) | |
Joined work of nakee and mine, cleanup the logging code a bit.
This solves the random __Log symbol and crash problem on linux
Please tell us if you find problems in the logging code
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2109 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Src/Common.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index 8b241bf8db..646f335027 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -196,14 +196,10 @@ inline u64 swap64(u64 data) {return(((u64)swap32(data) << 32) | swap32(data >> 3 } // end of namespace Common -////////////////////////////////////////////////////////////////////////////////////////// // Utility functions -// ŻŻŻŻŻŻŻŻŻ -/////////////////////////// // Message alerts -// ŻŻŻŻŻŻŻŻŻ enum MSG_TYPE { INFORMATION, @@ -230,12 +226,7 @@ extern bool MsgAlert(const char* caption, bool yes_no, int Style, const char* fo -/////////////////////////// // Logging -// ŻŻŻŻŻŻŻŻŻ - -extern void __Log(int logNumber, const char* text, ...); -extern void __Logv(int log, int v, const char *format, ...); // dummy class class LogTypes @@ -279,14 +270,25 @@ class LogTypes }; }; +#ifdef LOGGING +extern void __Log(int logNumber, const char* text, ...); +extern void __Logv(int log, int v, const char *format, ...); void Host_UpdateLogDisplay(); // Logging macros. LOGGING is turned on from earlier in this file -#ifdef LOGGING +#ifdef _WIN32 #define LOG(t, ...) __Log(LogTypes::t, __VA_ARGS__); #define LOGV(t,v, ...) __Log(LogTypes::t + (v)*100, __VA_ARGS__); +#define LOGP(t, ...) __Log(t, __VA_ARGS__); +#define LOGVP(t,v, ...) __Log(t + (v)*100, __VA_ARGS__); +#else +#define LOG(t, ...) __Log(LogTypes::t, ##__VA_ARGS__); +#define LOGV(t,v, ...) __Log(LogTypes::t + (v)*100, ##__VA_ARGS__); +#define LOGP(t, ...) __Log(t, ##__VA_ARGS__); +#define LOGVP(t,v, ...) __Log(t + (v)*100, ##__VA_ARGS__); +#endif #define _dbg_assert_(_t_, _a_) \ if (!(_a_)){\ @@ -305,6 +307,8 @@ void Host_UpdateLogDisplay(); #define LOG(_t_, ...) #define LOGV(_t_,_v_, ...) +#define LOGP(_t_, ...) +#define LOGVP(_t_,_v_, ...) #define _dbg_clear_() #ifndef _dbg_assert_ #define _dbg_assert_(_t_, _a_) ; @@ -326,9 +330,7 @@ void Host_UpdateLogDisplay(); #endif -////////////////////////////////////////////////////////////////////////////////////////// // Compile time asserts -// ŻŻŻŻŻŻŻŻŻ namespace { @@ -344,7 +346,6 @@ namespace #endif #endif } -////////////////////////////////// #endif // #ifndef _COMMON_H |