diff --git a/src/logger.cpp b/src/logger.cpp index fa5640a78acbd19ae74ee95c377d4beffc5b36c7..f660e33cfaa1bcc2f71ac5d46d638d102c95abdb 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -49,7 +49,7 @@ #include <sys/syscall.h> #endif // __linux__ -#ifdef WIN32 +#ifdef _WIN32 #include "winsyslog.h" #endif diff --git a/src/media/libav_utils.cpp b/src/media/libav_utils.cpp index fa946859549bea4ed7b2f2c67f4b124a7257090f..df55800d3969c4e91ff5520f6fd369d06db22ff7 100644 --- a/src/media/libav_utils.cpp +++ b/src/media/libav_utils.cpp @@ -76,6 +76,7 @@ static constexpr const char* AVLOGLEVEL = "AVLOGLEVEL"; static void setAvLogLevel() { +#ifndef RING_UWP char* envvar = getenv(AVLOGLEVEL); signed level = AV_LOG_WARNING; @@ -86,6 +87,9 @@ setAvLogLevel() level = std::max(AV_LOG_QUIET, std::min(level, AV_LOG_DEBUG)); } av_log_set_level(level); +#else + av_log_set_level(0); +#endif } static void diff --git a/src/winsyslog.c b/src/winsyslog.c index 66235b5b96dd3562bd15d0885162036b1cd66944..fd86982d9f178461a99292c6c78196108ea15077 100644 --- a/src/winsyslog.c +++ b/src/winsyslog.c @@ -65,7 +65,9 @@ getLastErrorText( // converts "Lasr Error" code into text void closelog(void) { +#ifndef RING_UWP DeregisterEventSource(loghdl); +#endif free(loghdr); } @@ -83,6 +85,7 @@ void closelog(void) vsprintf(tmp, format, arglist); +#ifndef RING_UWP arr[0] = tmp; BOOL err = ReportEvent(loghdl, (unsigned short) level, (unsigned short)level, level, NULL, 1, 0, arr, NULL); @@ -92,6 +95,7 @@ void closelog(void) CHAR errText[1024]; puts(getLastErrorText(errText, 1024)); } +#endif } /* Emulator for BSD openlog() routine @@ -106,7 +110,9 @@ void closelog(void) if (loghdl) { closelog(); } +#ifndef RING_UWP loghdl = RegisterEventSource(NULL, ident); +#endif sprintf(tmp, (logopt & WINLOG_PID) ? "%s[%d]" : "%s", ident, getpid()); loghdr = _strdup(tmp); /* save header for later */ }