diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-03-22 13:41:50 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-03-22 13:41:50 +0200 |
| commit | 2671b9af1b9b492e32cbe204bbeca5a3af35cf0c (patch) | |
| tree | 5ff898a9b2164f70f1acf8b8d055286ca71bc2bc | |
| parent | 7d0ad0f5211087124d0897869275f51f83780cc5 (diff) | |
| download | minetest-2671b9af1b9b492e32cbe204bbeca5a3af35cf0c.tar.gz minetest-2671b9af1b9b492e32cbe204bbeca5a3af35cf0c.tar.bz2 minetest-2671b9af1b9b492e32cbe204bbeca5a3af35cf0c.zip | |
Move headers from socket.h to socket.cpp
| -rw-r--r-- | src/socket.cpp | 27 | ||||
| -rw-r--r-- | src/socket.h | 25 |
2 files changed, 27 insertions, 25 deletions
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 { |