From 8e0aa5f780e453b36a02471ab7a587376373044b Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 31 Mar 2022 20:28:29 +0200 Subject: Removed windows.h include and types from NetSock --- NetEx/NetSock.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'NetEx/NetSock.cpp') diff --git a/NetEx/NetSock.cpp b/NetEx/NetSock.cpp index 5d4f35d..9dc957d 100644 --- a/NetEx/NetSock.cpp +++ b/NetEx/NetSock.cpp @@ -3,20 +3,23 @@ Copyright (c) 2011-2012, Starshatter OpenSource Distribution Contributors Copyright (c) 1997-2006, Destroyer Studios LLC. - AUTHOR: John DiCamillo + AUTHOR: John DiCamillo - OVERVIEW - ======== - Network (IP) Socket Wrapper Implementation + OVERVIEW + ======== + Network (IP) Socket Wrapper Implementation */ +#include "NetSock.h" -// WINSOCK2.H MUST COME FIRST!! #include -#include "NetSock.h" +#include + +#include "NetAddr.h" #include "NetLayer.h" +#include "Text.h" // +-------------------------------------------------------------------+ @@ -38,7 +41,7 @@ NetSock::NetSock(bool str) * PRIVATE: used only by the accept call to build a socket for * a client connection to this server */ -NetSock::NetSock(SOCKET sock, bool str) +NetSock::NetSock(int sock, bool str) : s(sock), stream(str), closed(false), stat(0), current_timeout(9999) { } @@ -120,7 +123,7 @@ NetSock::available() { if (closed || s == INVALID_SOCKET) return 0; - DWORD nbytes = 0; + unsigned long nbytes = 0; if (::ioctlsocket(s, FIONREAD, &nbytes) == 0) return (int) nbytes; @@ -328,10 +331,10 @@ NetSock::close() // +--------------------------------------------------------------------+ -DWORD +std::uint32_t NetSock::max_packet_size() const { - DWORD size = 0; + std::uint32_t size = 0; int len = sizeof(size); ::getsockopt(s, SOL_SOCKET, 0x2003, (char*) &size, &len); -- cgit v1.1