Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-30 11:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move headers from socket.h to socket.cpp

Browse Source
This commit is contained in:
Perttu Ahola 2012-03-22 13:41:50 +02:00
parent 7d0ad0f521
commit 2671b9af1b
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/socket.cpp
View File

@ -18,6 +18,33 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/ */
#include "socket.h" #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 "debug.h"
#include <stdio.h> #include <stdio.h>
#include <iostream> #include <iostream>

25
src/socket.h
View File

@ -20,33 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef SOCKET_HEADER #ifndef SOCKET_HEADER
#define 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 <ostream>
#include "exceptions.h" #include "exceptions.h"
#include "constants.h"
class SocketException : public BaseException class SocketException : public BaseException
{ {