removed duplicate "bmp"

[oweals/minetest.git] / src / socket.h

diff --git a/src/socket.h b/src/socket.h
index b6b58007392dc5a6b40347251d650cfa9070ee6b..c2b496e9ed3afffd4dde041a56e68766400a61c3 100644 (file)
--- a/src/socket.h
+++ b/src/socket.h
@@ -22,13 +22,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #ifdef _WIN32
        #define WIN32_LEAN_AND_MEAN
+       // Without this some of the network functions are not found on mingw
+       #ifndef _WIN32_WINNT
+               #define _WIN32_WINNT 0x0501
+       #endif
        #include <windows.h>
        #include <winsock2.h>
        #include <ws2tcpip.h>
-       #pragma comment(lib, "wsock32.lib")
+       #ifdef _MSC_VER
+               #pragma comment(lib, "ws2_32.lib")
+       #endif
 typedef SOCKET socket_t;
 typedef int socklen_t;
 #else
+       #include <sys/types.h>
        #include <sys/socket.h>
        #include <netinet/in.h>
        #include <fcntl.h>
@@ -85,6 +92,8 @@ public:
        unsigned int getAddress() const;
        unsigned short getPort() const;
        void setAddress(unsigned int address);
+       void setAddress(unsigned int a, unsigned int b,
+                       unsigned int c, unsigned int d);
        void setPort(unsigned short port);
        void print(std::ostream *s) const;
        void print() const;