Tune caves

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

diff --git a/src/socket.h b/src/socket.h
index c2b496e9ed3afffd4dde041a56e68766400a61c3..ac26b575c78b346a21357bf329549165400d0e4d 100644 (file)
--- a/src/socket.h
+++ b/src/socket.h
@@ -20,33 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SOCKET_HEADER
 #define SOCKET_HEADER
 
-#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>
-       #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>
-       #include <netdb.h>
-       #include <unistd.h>
-typedef int socket_t;
-#endif
-
 #include <ostream>
 #include "exceptions.h"
-#include "constants.h"
+
+extern bool socket_enable_debug_output;
 
 class SocketException : public BaseException
 {
@@ -97,6 +74,7 @@ public:
        void setPort(unsigned short port);
        void print(std::ostream *s) const;
        void print() const;
+       std::string serializeString() const;
 private:
        unsigned int m_address;
        unsigned short m_port;