fix a few conflicts with <windows.h>:

- prefix log-constants with LOG_
- remove already defined WAIT_TIMEOUT
- use more portable _WIN32 instead of __WIN32__
- define <stdint.h> types for MSVC

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2755 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 5 insertions, 5 deletions

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);
 	}
 };