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/VideoCommon | |
| 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/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Src/VideoCommon.h | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/Source/Core/VideoCommon/Src/VideoCommon.h b/Source/Core/VideoCommon/Src/VideoCommon.h index a035072cf6..a404e06cce 100644 --- a/Source/Core/VideoCommon/Src/VideoCommon.h +++ b/Source/Core/VideoCommon/Src/VideoCommon.h @@ -86,29 +86,23 @@ struct TRectangle };
-//////////////////////////////////////////////////////////////////////////////////////////
+
// Logging
// ŻŻŻŻŻŻŻŻŻŻ
void DebugLog(const char* _fmt, ...); // This one goes to the main program
-void __Log(const char *format, ...); // This one is for the local console
-void __Log(int type, const char *format, ...);
void HandleGLError();
-#define ERROR_LOG __Log
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
- // FIXME ugly hack for debug to build should use logmanager
- //#define INFO_LOG if( g_Config.iLog & CONF_LOG ) __Log
- //#define PRIM_LOG if( g_Config.iLog & CONF_PRIMLOG ) __Log
- #define INFO_LOG __Log
- #define PRIM_LOG __Log
- #define DEBUG_LOG __Log
+#ifdef _WIN32
+#define ERROR_LOG(...) LOG(VIDEO, __VA_ARGS__)
+#define INFO_LOG(...) LOG(VIDEO, __VA_ARGS__)
+#define PRIM_LOG(...) LOG(VIDEO, __VA_ARGS__)
+#define DEBUG_LOG(...) LOG(VIDEO, __VA_ARGS__)
#else
- #define INFO_LOG(...)
- #define PRIM_LOG(...)
- #define DEBUG_LOG(...)
+#define ERROR_LOG(...) LOG(VIDEO, ##__VA_ARGS__)
+#define INFO_LOG(...) LOG(VIDEO, ##__VA_ARGS__)
+#define PRIM_LOG(...) LOG(VIDEO, ##__VA_ARGS__)
+#define DEBUG_LOG(...) LOG(VIDEO, ##__VA_ARGS__)
#endif
-///////////////////////////////////
#endif // _VIDEOCOMMON_H
|