From 5bbc3aef1368cc1fcc59304013f0999b0827115b Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Mon, 17 Jul 2023 15:36:03 -0400 Subject: network: Forward declarations --- src/core/hle/service/nifm/nifm.cpp | 1 + src/core/hle/service/nifm/nifm.h | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/core/hle') diff --git a/src/core/hle/service/nifm/nifm.cpp b/src/core/hle/service/nifm/nifm.cpp index 91d42853e..21b06d10b 100644 --- a/src/core/hle/service/nifm/nifm.cpp +++ b/src/core/hle/service/nifm/nifm.cpp @@ -7,6 +7,7 @@ #include "core/hle/service/kernel_helpers.h" #include "core/hle/service/nifm/nifm.h" #include "core/hle/service/server_manager.h" +#include "network/network.h" namespace { diff --git a/src/core/hle/service/nifm/nifm.h b/src/core/hle/service/nifm/nifm.h index 9b20e6823..ae99c4695 100644 --- a/src/core/hle/service/nifm/nifm.h +++ b/src/core/hle/service/nifm/nifm.h @@ -4,14 +4,15 @@ #pragma once #include "core/hle/service/service.h" -#include "network/network.h" -#include "network/room.h" -#include "network/room_member.h" namespace Core { class System; } +namespace Network { +class RoomNetwork; +} + namespace Service::NIFM { void LoopProcess(Core::System& system); -- cgit v1.2.3 From e0fb1d3d172d4372a1216e939b3cac941782b09e Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Mon, 17 Jul 2023 15:38:28 -0400 Subject: ssl: Reorder inclusions --- src/core/hle/service/ssl/ssl_backend.h | 8 ++++---- src/core/hle/service/ssl/ssl_backend_none.cpp | 4 ++-- src/core/hle/service/ssl/ssl_backend_openssl.cpp | 16 ++++++++-------- src/core/hle/service/ssl/ssl_backend_schannel.cpp | 8 ++++---- src/core/hle/service/ssl/ssl_backend_securetransport.cpp | 15 +++++++++------ 5 files changed, 27 insertions(+), 24 deletions(-) (limited to 'src/core/hle') diff --git a/src/core/hle/service/ssl/ssl_backend.h b/src/core/hle/service/ssl/ssl_backend.h index 25c16bcc1..409f4367c 100644 --- a/src/core/hle/service/ssl/ssl_backend.h +++ b/src/core/hle/service/ssl/ssl_backend.h @@ -3,15 +3,15 @@ #pragma once -#include "core/hle/result.h" - -#include "common/common_types.h" - #include #include #include #include +#include "common/common_types.h" + +#include "core/hle/result.h" + namespace Network { class SocketBase; } diff --git a/src/core/hle/service/ssl/ssl_backend_none.cpp b/src/core/hle/service/ssl/ssl_backend_none.cpp index f2f0ef706..2f4f23c42 100644 --- a/src/core/hle/service/ssl/ssl_backend_none.cpp +++ b/src/core/hle/service/ssl/ssl_backend_none.cpp @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/ssl/ssl_backend.h" - #include "common/logging/log.h" +#include "core/hle/service/ssl/ssl_backend.h" + namespace Service::SSL { ResultVal> CreateSSLConnectionBackend() { diff --git a/src/core/hle/service/ssl/ssl_backend_openssl.cpp b/src/core/hle/service/ssl/ssl_backend_openssl.cpp index f69674f77..6ca869dbf 100644 --- a/src/core/hle/service/ssl/ssl_backend_openssl.cpp +++ b/src/core/hle/service/ssl/ssl_backend_openssl.cpp @@ -1,14 +1,6 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/ssl/ssl_backend.h" -#include "core/internal_network/network.h" -#include "core/internal_network/sockets.h" - -#include "common/fs/file.h" -#include "common/hex_util.h" -#include "common/string_util.h" - #include #include @@ -16,6 +8,14 @@ #include #include +#include "common/fs/file.h" +#include "common/hex_util.h" +#include "common/string_util.h" + +#include "core/hle/service/ssl/ssl_backend.h" +#include "core/internal_network/network.h" +#include "core/internal_network/sockets.h" + using namespace Common::FS; namespace Service::SSL { diff --git a/src/core/hle/service/ssl/ssl_backend_schannel.cpp b/src/core/hle/service/ssl/ssl_backend_schannel.cpp index a1d6a186e..368735d8c 100644 --- a/src/core/hle/service/ssl/ssl_backend_schannel.cpp +++ b/src/core/hle/service/ssl/ssl_backend_schannel.cpp @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/ssl/ssl_backend.h" -#include "core/internal_network/network.h" -#include "core/internal_network/sockets.h" +#include #include "common/error.h" #include "common/fs/file.h" #include "common/hex_util.h" #include "common/string_util.h" -#include +#include "core/hle/service/ssl/ssl_backend.h" +#include "core/internal_network/network.h" +#include "core/internal_network/sockets.h" namespace { diff --git a/src/core/hle/service/ssl/ssl_backend_securetransport.cpp b/src/core/hle/service/ssl/ssl_backend_securetransport.cpp index be40a5aeb..b3083cbad 100644 --- a/src/core/hle/service/ssl/ssl_backend_securetransport.cpp +++ b/src/core/hle/service/ssl/ssl_backend_securetransport.cpp @@ -1,18 +1,21 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/ssl/ssl_backend.h" -#include "core/internal_network/network.h" -#include "core/internal_network/sockets.h" - #include -#include - // SecureTransport has been deprecated in its entirety in favor of // Network.framework, but that does not allow layering TLS on top of an // arbitrary socket. +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#include +#pragma GCC diagnostic pop +#endif + +#include "core/hle/service/ssl/ssl_backend.h" +#include "core/internal_network/network.h" +#include "core/internal_network/sockets.h" namespace { -- cgit v1.2.3 From 16c238e4b92fc20a8a49e2a6713366fd3cfafad8 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Mon, 17 Jul 2023 15:44:15 -0400 Subject: ssl: Link with crypt32 for secure channel backend --- src/core/hle/service/ssl/ssl_backend_schannel.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/core/hle') diff --git a/src/core/hle/service/ssl/ssl_backend_schannel.cpp b/src/core/hle/service/ssl/ssl_backend_schannel.cpp index 368735d8c..d8074339a 100644 --- a/src/core/hle/service/ssl/ssl_backend_schannel.cpp +++ b/src/core/hle/service/ssl/ssl_backend_schannel.cpp @@ -20,6 +20,7 @@ namespace { #define SECURITY_WIN32 #include #include +#include std::once_flag one_time_init_flag; bool one_time_init_success = false; -- cgit v1.2.3