From eaaa6f575e6ccd924469e0089a828c6009f7e250 Mon Sep 17 00:00:00 2001
From: atraczyk <andreastraczyk@gmail.com>
Date: Mon, 13 Feb 2017 12:49:34 -0500
Subject: [PATCH] build(UWP): remove UWP API violations
- Removes some remaining forbidden API calls from the daemon.
Change-Id: I4276e7a439f15c768179dd49ef64863de54f3a77
Tuleap: #790
---
src/logger.cpp | 2 +-
src/media/libav_utils.cpp | 4 ++++
src/winsyslog.c | 6 ++++++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/logger.cpp b/src/logger.cpp
index fa5640a78a..f660e33cfa 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 fa94685954..df55800d39 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 66235b5b96..fd86982d9f 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 */
}
--
GitLab