From 59410b9d628092f0519dda6e17332d6cad0a8484 Mon Sep 17 00:00:00 2001 From: oltolm Date: Tue, 23 Jan 2024 00:19:16 +0100 Subject: [PATCH] fix compiler warnings --- rpcs3/Emu/NP/rpcn_client.cpp | 4 ++-- rpcs3/Emu/RSX/Program/GLSLCommon.cpp | 2 +- rpcs3/rpcs3qt/qt_camera_video_sink.h | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rpcs3/Emu/NP/rpcn_client.cpp b/rpcs3/Emu/NP/rpcn_client.cpp index ab8522007c..fcbddee27d 100644 --- a/rpcs3/Emu/NP/rpcn_client.cpp +++ b/rpcs3/Emu/NP/rpcn_client.cpp @@ -798,12 +798,12 @@ namespace rpcn addr_rpcn.sin_port = std::bit_cast>(port); // htons addr_rpcn.sin_family = AF_INET; -#ifdef WIN32 +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4996) #endif hostent* host_addr = gethostbyname(splithost[0].c_str()); -#ifdef WIN32 +#ifdef _MSC_VER #pragma warning(pop) #endif if (!host_addr) diff --git a/rpcs3/Emu/RSX/Program/GLSLCommon.cpp b/rpcs3/Emu/RSX/Program/GLSLCommon.cpp index 6965a50371..3d7197f53a 100644 --- a/rpcs3/Emu/RSX/Program/GLSLCommon.cpp +++ b/rpcs3/Emu/RSX/Program/GLSLCommon.cpp @@ -161,7 +161,7 @@ namespace glsl void insert_rop(std::ostream& OS, const shader_properties& /*props*/) { OS << - #include "GLSLSnippets//RSXProg/RSXROPEpilogue.glsl" + #include "GLSLSnippets/RSXProg/RSXROPEpilogue.glsl" ; } diff --git a/rpcs3/rpcs3qt/qt_camera_video_sink.h b/rpcs3/rpcs3qt/qt_camera_video_sink.h index 20f8dda460..94946c177d 100644 --- a/rpcs3/rpcs3qt/qt_camera_video_sink.h +++ b/rpcs3/rpcs3qt/qt_camera_video_sink.h @@ -1,5 +1,7 @@ #pragma once +#include "util/atomic.hpp" +#include "util/types.hpp" #include #include #include