From 68d40f13be0ef63fd3a81263bbe52f8f11432199 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Thu, 22 May 2014 03:59:51 -0700
Subject: [PATCH] Fix a few warnings on windows
---
obs/obs-app.cpp | 2 +-
obs/window-basic-main.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/obs/obs-app.cpp b/obs/obs-app.cpp
index 3795d5926..634b7e611 100644
--- a/obs/obs-app.cpp
+++ b/obs/obs-app.cpp
@@ -71,9 +71,9 @@ static void do_log(int log_level, const char *msg, va_list args, void *param)
{
fstream &logFile = *static_cast<fstream*>(param);
char str[4096];
- va_list args2;
#ifndef _WIN32
+ va_list args2;
va_copy(args2, args);
#endif
diff --git a/obs/window-basic-main.cpp b/obs/window-basic-main.cpp
index 086d8db5b..75fa8331c 100644
--- a/obs/window-basic-main.cpp
+++ b/obs/window-basic-main.cpp
@@ -1289,7 +1289,7 @@ void OBSBasic::UploadLog(const char *file)
jsonData = std::move(ss.str());
- logUploadPostData.setData(jsonData.c_str(), jsonData.size());
+ logUploadPostData.setData(jsonData.c_str(), (int)jsonData.size());
QUrl url("https://api.github.com/gists");
logUploadReply = networkManager.post(QNetworkRequest(url),
--
GitLab