From: Perttu Ahola <celeron55@gmail.com>
Date: Thu, 22 Mar 2012 11:41:50 +0000 (+0200)
Subject: Move headers from socket.h to socket.cpp
X-Git-Tag: 0.4.dev-20120326~52
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2671b9af1b9b492e32cbe204bbeca5a3af35cf0c;p=oweals%2Fminetest.git

Move headers from socket.h to socket.cpp
---

diff --git a/src/socket.cpp b/src/socket.cpp
index af32210c4..ea65ffda3 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -18,6 +18,33 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "socket.h"
+
+#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>
+	#include <arpa/inet.h>
+typedef int socket_t;
+#endif
+
+#include "constants.h"
 #include "debug.h"
 #include <stdio.h>
 #include <iostream>
diff --git a/src/socket.h b/src/socket.h
index 74b5fb643..fe542dfcc 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -20,33 +20,8 @@ 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"
 
 class SocketException : public BaseException
 {