From ac8106bda24227a563f76e199d1628c63054db37 Mon Sep 17 00:00:00 2001 From: Yunus Shaikh <75296019+yunusshaikh7@users.noreply.github.com> Date: Mon, 12 Oct 2026 11:52:49 -0700 Subject: [PATCH] refactor(libSceNet): define timeout_option before receive_error #4673 adds a function after receive_error, so defining timeout_option there made the two pull requests conflict. --- core/libs/prx/libSceNet/Export.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/libs/prx/libSceNet/Export.cpp b/core/libs/prx/libSceNet/Export.cpp index 39ed00f0f..75b457392 100644 --- a/core/libs/prx/libSceNet/Export.cpp +++ b/core/libs/prx/libSceNet/Export.cpp @@ -381,6 +381,12 @@ std::int64_t message_length(const NetMsghdr* message) { return static_cast(total); } +int timeout_option(int optname) { + if (optname == NET_SO_SCE_SNDTIMEO) return NET_SO_SNDTIMEO; + if (optname == NET_SO_SCE_RCVTIMEO) return NET_SO_RCVTIMEO; + return optname; +} + int receive_error(const Sock& socket) { #ifdef _WIN32 if (WSAGetLastError() == WSAETIMEDOUT && socket.type != NET_SOCK_STREAM && socket.rcv_timeout_us > 0) return NET_EAGAIN; @@ -390,12 +396,6 @@ int receive_error(const Sock& socket) { return native_error(); } -int timeout_option(int optname) { - if (optname == NET_SO_SCE_SNDTIMEO) return NET_SO_SNDTIMEO; - if (optname == NET_SO_SCE_RCVTIMEO) return NET_SO_RCVTIMEO; - return optname; -} - } // namespace extern "C" {