summaryrefslogtreecommitdiff
path: root/src/core/network
diff options
context:
space:
mode:
authorGravatar Morph2021-09-12 12:01:23 -0400
committerGravatar GitHub2021-09-12 12:01:23 -0400
commit74030eb4277c179c62189a978b693e081bfe7c4c (patch)
treee2f4ba2fa65f8b9bdfbd86352a65539f46d9193f /src/core/network
parentMerge pull request #6986 from Morph1984/version-update (diff)
parentshader_environment: Add missing <algorithm> include (diff)
downloadyuzu-74030eb4277c179c62189a978b693e081bfe7c4c.tar.gz
yuzu-74030eb4277c179c62189a978b693e081bfe7c4c.tar.xz
yuzu-74030eb4277c179c62189a978b693e081bfe7c4c.zip
Merge pull request #6987 from Morph1984/common-error
common: Move error handling functions out of common_funcs
Diffstat (limited to 'src/core/network')
-rw-r--r--src/core/network/network.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/network/network.cpp b/src/core/network/network.cpp
index 4732d4485..72eea52f0 100644
--- a/src/core/network/network.cpp
+++ b/src/core/network/network.cpp
@@ -7,7 +7,8 @@
7#include <limits> 7#include <limits>
8#include <utility> 8#include <utility>
9#include <vector> 9#include <vector>
10#include "common/common_funcs.h" 10
11#include "common/error.h"
11 12
12#ifdef _WIN32 13#ifdef _WIN32
13#include <winsock2.h> 14#include <winsock2.h>
@@ -223,7 +224,7 @@ Errno GetAndLogLastError() {
223 if (err == Errno::AGAIN) { 224 if (err == Errno::AGAIN) {
224 return err; 225 return err;
225 } 226 }
226 LOG_ERROR(Network, "Socket operation error: {}", NativeErrorToString(e)); 227 LOG_ERROR(Network, "Socket operation error: {}", Common::NativeErrorToString(e));
227 return err; 228 return err;
228} 229}
229 230