From 84327a4b264040a6ad5bb1e202620dc279fe7871 Mon Sep 17 00:00:00 2001 From: tobigun Date: Sat, 27 Nov 2010 14:53:07 +0000 Subject: fix a few conflicts with : - prefix log-constants with LOG_ - remove already defined WAIT_TIMEOUT - use more portable _WIN32 instead of __WIN32__ - define types for MSVC git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2755 b956fd51-792f-4845-bead-9b4dfca2ff2c --- mediaplugin/src/mediaplugins/include/core/logger.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mediaplugin/src/mediaplugins/include/core/logger.h') diff --git a/mediaplugin/src/mediaplugins/include/core/logger.h b/mediaplugin/src/mediaplugins/include/core/logger.h index c9924b83..91cac10e 100644 --- a/mediaplugin/src/mediaplugins/include/core/logger.h +++ b/mediaplugin/src/mediaplugins/include/core/logger.h @@ -48,23 +48,23 @@ public: } void info(const std::string &msg, const std::string &context) const { - log(INFO, msg, context); + log(LOG_INFO, msg, context); } void status(const std::string &msg, const std::string &context) const { - log(STATUS, msg, context); + log(LOG_STATUS, msg, context); } void warn(const std::string &msg, const std::string &context) const { - log(WARN, msg, context); + log(LOG_WARN, msg, context); } void error(const std::string &msg, const std::string &context) const { - log(ERROR, msg, context); + log(LOG_ERROR, msg, context); } void critical(const std::string &msg, const std::string &context) const { - log(CRITICAL, msg, context); + log(LOG_CRITICAL, msg, context); } }; -- cgit v1.2.3