diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab47130f4b..d0a0a69594 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2389,8 +2389,6 @@ add_library(${CoreLibName} ${CoreLinkType}
Core/MIPS/MIPSAsm.h
Core/MIPS/MIPSTracer.cpp
Core/MIPS/MIPSTracer.h
- Core/Net/NetResolver.cpp
- Core/Net/NetResolver.h
Core/MemFault.cpp
Core/MemFault.h
Core/MemMap.cpp
diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj
index 2199d7c088..41d33dcc34 100644
--- a/Core/Core.vcxproj
+++ b/Core/Core.vcxproj
@@ -630,7 +630,6 @@
-
@@ -1222,7 +1221,6 @@
-
diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters
index bba38214d2..4093ef8d2e 100644
--- a/Core/Core.vcxproj.filters
+++ b/Core/Core.vcxproj.filters
@@ -94,9 +94,6 @@
{067e3128-3aaf-4ed1-b19e-bab11606abe7}
-
- {f1b3f688-26eb-4121-9914-e9e19ab04bcd}
-
@@ -1333,9 +1330,6 @@
HLE\Libraries
-
- Net
-
HLE\Libraries
@@ -2151,9 +2145,6 @@
HLE\Libraries
-
- Net
-
HLE\Libraries
diff --git a/Core/HLE/sceNetResolver.h b/Core/HLE/sceNetResolver.h
index 5c32ab2adb..5e155c6adf 100644
--- a/Core/HLE/sceNetResolver.h
+++ b/Core/HLE/sceNetResolver.h
@@ -19,10 +19,39 @@
#include
#include
-#include "Core/Net/NetResolver.h"
-
class SceNetResolver;
+class NetResolver {
+public:
+ NetResolver(const NetResolver& other) = default;
+
+ NetResolver() :
+ mId(0),
+ mIsRunning(false),
+ mBufferAddr(0),
+ mBufferLen(0) {
+ }
+
+ NetResolver(const int id, const u32 bufferAddr, const int bufferLen) :
+ mId(id),
+ mIsRunning(false),
+ mBufferAddr(bufferAddr),
+ mBufferLen(bufferLen) {
+ }
+
+ int GetId() const { return mId; }
+
+ bool GetIsRunning() const { return mIsRunning; }
+
+ void SetIsRunning(const bool isRunning) { this->mIsRunning = isRunning; }
+
+private:
+ int mId;
+ bool mIsRunning;
+ u32 mBufferAddr;
+ u32 mBufferLen;
+};
+
enum {
// pspnet_resolver
ERROR_NET_RESOLVER_NOT_TERMINATED = 0x80410401,
@@ -71,4 +100,4 @@ private:
std::shared_mutex mNetResolversLock;
};
-void Register_sceNetResolver();
\ No newline at end of file
+void Register_sceNetResolver();
diff --git a/Core/Net/NetResolver.cpp b/Core/Net/NetResolver.cpp
deleted file mode 100644
index ec9b79e6a9..0000000000
--- a/Core/Net/NetResolver.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "NetResolver.h"
-
-// TODO: remove me if the functions remain inlined
\ No newline at end of file
diff --git a/Core/Net/NetResolver.h b/Core/Net/NetResolver.h
deleted file mode 100644
index effa453c90..0000000000
--- a/Core/Net/NetResolver.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "CommonTypes.h"
-
-class NetResolver {
-public:
- NetResolver(const NetResolver& other) = default;
-
- NetResolver() :
- mId(0),
- mIsRunning(false),
- mBufferAddr(0),
- mBufferLen(0) {}
-
- NetResolver(const int id, const u32 bufferAddr, const int bufferLen) :
- mId(id),
- mIsRunning(false),
- mBufferAddr(bufferAddr),
- mBufferLen(bufferLen) {}
-
- int GetId() const { return mId; }
-
- bool GetIsRunning() const { return mIsRunning; }
-
- void SetIsRunning(const bool isRunning) { this->mIsRunning = isRunning; }
-
-private:
- int mId;
- bool mIsRunning;
- u32 mBufferAddr;
- u32 mBufferLen;
-};
diff --git a/UWP/CoreUWP/CoreUWP.vcxproj b/UWP/CoreUWP/CoreUWP.vcxproj
index 403d7a8d77..94bd854ec5 100644
--- a/UWP/CoreUWP/CoreUWP.vcxproj
+++ b/UWP/CoreUWP/CoreUWP.vcxproj
@@ -319,7 +319,6 @@
-
@@ -619,7 +618,6 @@
-
diff --git a/UWP/CoreUWP/CoreUWP.vcxproj.filters b/UWP/CoreUWP/CoreUWP.vcxproj.filters
index ee22096786..b032f05781 100644
--- a/UWP/CoreUWP/CoreUWP.vcxproj.filters
+++ b/UWP/CoreUWP/CoreUWP.vcxproj.filters
@@ -1223,9 +1223,6 @@
HLE
-
- Net
-
HLE
@@ -1939,9 +1936,6 @@
HLE
-
- Net
-
HLE
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index e82f771528..3a05e714aa 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -510,7 +510,6 @@ EXEC_AND_LIB_FILES := \
$(SRC)/Core/MIPS/IR/IRNativeCommon.cpp \
$(SRC)/Core/MIPS/IR/IRPassSimplify.cpp \
$(SRC)/Core/MIPS/IR/IRRegCache.cpp \
- $(SRC)/Core/Net/NetResolver.cpp \
$(SRC)/GPU/Math3D.cpp \
$(SRC)/GPU/GPU.cpp \
$(SRC)/GPU/GPUCommon.cpp \
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index c836bcbee9..d58bc1e4bc 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -816,7 +816,6 @@ SOURCES_CXX += \
$(COREDIR)/MemFault.cpp \
$(COREDIR)/MemMap.cpp \
$(COREDIR)/MemMapFunctions.cpp \
- $(COREDIR)/Net/NetResolver.cpp \
$(COREDIR)/PSPLoaders.cpp \
$(COREDIR)/Replay.cpp \
$(COREDIR)/Reporting.cpp \