diff options
| author |  Ryan Loebs | 2016-03-29 14:24:03 -0700 |
|---|---|---|
| committer | Ryan Loebs | 2016-03-29 14:24:03 -0700 |
| commit | b8422b24bd733c745c519ddd0e1d45a9191aca76 (patch) | |
| tree | 3ccc88637914a4bc4e55120a155567cf95737270 | |
| parent | Formatting... (diff) | |
| download | yuzu-b8422b24bd733c745c519ddd0e1d45a9191aca76.tar.gz yuzu-b8422b24bd733c745c519ddd0e1d45a9191aca76.tar.xz yuzu-b8422b24bd733c745c519ddd0e1d45a9191aca76.zip | |
Compiling on Windows now
| -rw-r--r-- | src/core/hle/service/soc_u.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp index 43194345c..4606ad743 100644 --- a/src/core/hle/service/soc_u.cpp +++ b/src/core/hle/service/soc_u.cpp | |||
| @@ -729,12 +729,12 @@ static void GetSockOpt(Service::Interface* self) { | |||
| 729 | u32 socket_handle = cmd_buffer[1]; | 729 | u32 socket_handle = cmd_buffer[1]; |
| 730 | u32 level = cmd_buffer[2]; | 730 | u32 level = cmd_buffer[2]; |
| 731 | u32 optname = cmd_buffer[3]; | 731 | u32 optname = cmd_buffer[3]; |
| 732 | u32 optlen = cmd_buffer[4]; | 732 | int optlen = (int)cmd_buffer[4]; |
| 733 | 733 | ||
| 734 | // 0x100 = static buffer offset (bytes) | 734 | // 0x100 = static buffer offset (bytes) |
| 735 | // + 0x4 = 2nd pointer (u32) position | 735 | // + 0x4 = 2nd pointer (u32) position |
| 736 | // >> 2 = convert to u32 offset instead of byte offset (cmd_buffer = u32*) | 736 | // >> 2 = convert to u32 offset instead of byte offset (cmd_buffer = u32*) |
| 737 | u8* optval = Memory::GetPointer(cmd_buffer[0x104 >> 2]); | 737 | char* optval = reinterpret_cast<char*>(Memory::GetPointer(cmd_buffer[0x104 >> 2])); |
| 738 | 738 | ||
| 739 | int ret = ::getsockopt(socket_handle, level, optname, optval, &optlen); | 739 | int ret = ::getsockopt(socket_handle, level, optname, optval, &optlen); |
| 740 | int err = 0; | 740 | int err = 0; |
| @@ -754,7 +754,7 @@ static void SetSockOpt(Service::Interface* self) { | |||
| 754 | u32 level = cmd_buffer[2]; | 754 | u32 level = cmd_buffer[2]; |
| 755 | u32 optname = cmd_buffer[3]; | 755 | u32 optname = cmd_buffer[3]; |
| 756 | socklen_t optlen = static_cast<socklen_t>(cmd_buffer[4]); | 756 | socklen_t optlen = static_cast<socklen_t>(cmd_buffer[4]); |
| 757 | u8 *optval = Memory::GetPointer(cmd_buffer[8]); | 757 | const char *optval = reinterpret_cast<const char*>(Memory::GetPointer(cmd_buffer[8])); |
| 758 | 758 | ||
| 759 | int ret = static_cast<u32>(::setsockopt(socket_handle, level, optname, optval, optlen)); | 759 | int ret = static_cast<u32>(::setsockopt(socket_handle, level, optname, optval, optlen)); |
| 760 | int err = 0; | 760 | int err = 0; |