cpp/openttd-patchpack/source Changeset - r11549:ae69aa3bf4f9

Changeset - r11549:ae69aa3bf4f9

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

glx - 15 years ago 2009-04-02 23:22:59
glx@openttd.org

(svn r15919) -Fix (r15916): mingw doesn't know getnameinfo() (unless you compile for XP SP2+). Also fix a MSVC warning.

2 files changed with 20 insertions and 1 deletions:

src/network/core/os_abstraction.h

src/network/core/tcp_content.h

0 comments (0 inline, 0 general)

src/network/core/os_abstraction.h

➞

Show inline comments

 	/* Windows has some different names for some types */
 	typedef SSIZE_T ssize_t;
 	typedef int socklen_t;
 #else
 #include "../../win32.h"
 static inline int OTTDgetnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, DWORD hostlen, char *serv, DWORD servlen, int flags)
+{
 	static int (WINAPI *getnameinfo)(const struct sockaddr *, socklen_t, char *, DWORD, char *, DWORD, int) = NULL;
 	static bool first_time = true;
 	if (first_time) {
 		LoadLibraryList((Function*)&getnameinfo, "ws2_32.dll\0getnameinfo\0\0");
 		first_time = false;
+	}
 	if (getnameinfo != NULL) return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
 	strncpy(host, inet_ntoa(((struct sockaddr_in *)sa)->sin_addr), hostlen);
 	return 0;
+}
 #define getnameinfo OTTDgetnameinfo
 #endif
 #define GET_LAST_ERROR() WSAGetLastError()

src/network/core/tcp_content.h

➞

Show inline comments

@@ @@ -101,7 +101,7 @@ struct ContentInfo { @@
 /** Base socket handler for all Content TCP sockets */
 class NetworkContentSocketHandler : public NetworkTCPSocketHandler {
 protected:
-	struct NetworkAddress client_addr; ///< The address we're connected to.
 	NetworkAddress client_addr; ///< The address we're connected to.
 	virtual void Close();
 	/**

0 comments (0 inline, 0 general)