X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fsocket.h;h=994a07e45b3b712fe983a12c10869554cf6c0d6a;hb=44053101840594e133886986d28e557bdfb57e8b;hp=c2b496e9ed3afffd4dde041a56e68766400a61c3;hpb=cabe6f1d65a84a6f047553eb5d859f407bff6a70;p=dragonfireclient.git

diff --git a/src/socket.h b/src/socket.h
index c2b496e9e..994a07e45 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -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 @@ class Address
 	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;