cpp/openttd-patchpack/source Changeset - r25352:61444beef02a

Changeset - r25352:61444beef02a

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium42 - 3 years ago 2021-04-30 17:21:02
rubidium@openttd.org

Codechange: move some OS abstraction method implementations out of the header

2 files changed with 52 insertions and 50 deletions:

src/network/core/os_abstraction.cpp

src/network/core/os_abstraction.h

0 comments (0 inline, 0 general)

src/network/core/os_abstraction.cpp

➞

Show inline comments

 	return NetworkError(errno);
 #endif
+}
 /**
  * Try to set the socket into non-blocking mode.
  * @param d The socket to set the non-blocking more for.
  * @return True if setting the non-blocking mode succeeded, otherwise false.
  */
 bool SetNonBlocking(SOCKET d)
+{
 #if defined(_WIN32)
 	u_long nonblocking = 1;
 	return ioctlsocket(d, FIONBIO, &nonblocking) == 0;
 #elif defined __EMSCRIPTEN__
 	return true;
 #else
 	int nonblocking = 1;
 	return ioctl(d, FIONBIO, &nonblocking) == 0;
 #endif
+}
 /**
  * Try to set the socket to not delay sending.
  * @param d The socket to disable the delaying for.
  * @return True if disabling the delaying succeeded, otherwise false.
  */
 bool SetNoDelay(SOCKET d)
+{
 #ifdef __EMSCRIPTEN__
 	return true;
 #else
 	int flags = 1;
 	/* The (const char*) cast is needed for windows */
 	return setsockopt(d, IPPROTO_TCP, TCP_NODELAY, (const char *)&flags, sizeof(flags)) == 0;
 #endif
+}
 /**
  * Get the error from a socket, if any.
  * @param d The socket to get the error from.
  * @return The errno on the socket.
  */
 NetworkError GetSocketError(SOCKET d)
+{
 	int err;
 	socklen_t len = sizeof(err);
 	getsockopt(d, SOL_SOCKET, SO_ERROR, (char *)&err, &len);
 	return NetworkError(err);
+}

src/network/core/os_abstraction.h

➞

Show inline comments

 #	endif
 #	define SOCKET int
 #	define INVALID_SOCKET -1
 #	define ioctlsocket ioctl
 #	define closesocket close
 /* Need this for FIONREAD on solaris */
 #	define BSD_COMP
 #if defined(__OS2__)
 #	define SOCKET int
 #	define INVALID_SOCKET -1
 #	define ioctlsocket ioctl
 #	define closesocket close
 /* Includes needed for OS/2 systems */
+}
 #endif
 /**
  * Try to set the socket into non-blocking mode.
  * @param d The socket to set the non-blocking more for.
  * @return True if setting the non-blocking mode succeeded, otherwise false.
  */
 static inline bool SetNonBlocking(SOCKET d)
+{
 #ifdef __EMSCRIPTEN__
 	return true;
 #else
 #	ifdef _WIN32
 	u_long nonblocking = 1;
 #	else
 	int nonblocking = 1;
 #	endif
 	return ioctlsocket(d, FIONBIO, &nonblocking) == 0;
 #endif
+}
 /**
  * Try to set the socket to not delay sending.
  * @param d The socket to disable the delaying for.
  * @return True if disabling the delaying succeeded, otherwise false.
  */
 static inline bool SetNoDelay(SOCKET d)
+{
 #ifdef __EMSCRIPTEN__
 	return true;
 #else
 	/* XXX should this be done at all? */
 	int b = 1;
 	/* The (const char*) cast is needed for windows */
 	return setsockopt(d, IPPROTO_TCP, TCP_NODELAY, (const char*)&b, sizeof(b)) == 0;
 #endif
+}
 /**
  * Get the error from a socket, if any.
  * @param d The socket to get the error from.
  * @return The errno on the socket.
  */
 static inline NetworkError GetSocketError(SOCKET d)
+{
 	int err;
 	socklen_t len = sizeof(err);
 	getsockopt(d, SOL_SOCKET, SO_ERROR, (char *)&err, &len);
 	return NetworkError(err);
+}
 bool SetNonBlocking(SOCKET d);
 bool SetNoDelay(SOCKET d);
 NetworkError GetSocketError(SOCKET d);
 /* Make sure these structures have the size we expect them to be */
 static_assert(sizeof(in_addr)  ==  4); ///< IPv4 addresses should be 4 bytes.

0 comments (0 inline, 0 general)