oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.20.x'

Browse Source
This commit is contained in:
Max Kellermann
2017-12-16 20:50:53 +01:00
parent fbc4bb29dc f1ef9f9d31
commit 6246d36fe6
105 changed files with 270 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/AllocatedSocketAddress.cxx
View File

@@ -37,7 +37,7 @@
#endif
#ifdef HAVE_TCP
#ifdef WIN32
#ifdef _WIN32
#include <ws2tcpip.h>
#else
#include <netinet/in.h>

2
src/net/Resolver.cxx
View File

@@ -23,7 +23,7 @@
#include <string>
#ifdef WIN32
#ifdef _WIN32
#include <ws2tcpip.h>
#else
#include <sys/types.h>

2
src/net/SocketAddress.cxx
View File

@@ -33,7 +33,7 @@
#include <string.h>
#ifdef HAVE_TCP
#ifdef WIN32
#ifdef _WIN32
#include <ws2tcpip.h>
#else
#include <netinet/in.h>

4
src/net/SocketAddress.hxx
View File

@@ -35,7 +35,7 @@
#include <cstddef>
#ifdef WIN32
#ifdef _WIN32
#include <winsock2.h>
#else
#include <sys/socket.h>
@@ -46,7 +46,7 @@
*/
class SocketAddress {
public:
#ifdef WIN32
#ifdef _WIN32
typedef int size_type;
#else
typedef socklen_t size_type;

2
src/net/SocketDescriptor.cxx
View File

@@ -108,7 +108,7 @@ SocketDescriptor::Connect(SocketAddress address)
bool
SocketDescriptor::Create(int domain, int type, int protocol)
{
#ifdef WIN32
#ifdef _WIN32
static bool initialised = false;
if (!initialised) {
WSADATA data;

2
src/net/SocketError.cxx
View File

@@ -23,7 +23,7 @@
#include <string.h>
#ifdef WIN32
#ifdef _WIN32
SocketErrorMessage::SocketErrorMessage(socket_error_t code) noexcept
{

14
src/net/SocketError.hxx
View File

@@ -23,7 +23,7 @@
#include "Compiler.h"
#include "system/Error.hxx"
#ifdef WIN32
#ifdef _WIN32
#include <winsock2.h>
typedef DWORD socket_error_t;
#else
@@ -35,7 +35,7 @@ gcc_pure
static inline socket_error_t
GetSocketError() noexcept
{
#ifdef WIN32
#ifdef _WIN32
return WSAGetLastError();
#else
return errno;
@@ -46,7 +46,7 @@ gcc_const
static inline bool
IsSocketErrorAgain(socket_error_t code) noexcept
{
#ifdef WIN32
#ifdef _WIN32
return code == WSAEINPROGRESS;
#else
return code == EAGAIN;
@@ -57,7 +57,7 @@ gcc_const
static inline bool
IsSocketErrorInterruped(socket_error_t code) noexcept
{
#ifdef WIN32
#ifdef _WIN32
return code == WSAEINTR;
#else
return code == EINTR;
@@ -68,7 +68,7 @@ gcc_const
static inline bool
IsSocketErrorClosed(socket_error_t code) noexcept
{
#ifdef WIN32
#ifdef _WIN32
return code == WSAECONNRESET;
#else
return code == EPIPE || code == ECONNRESET;
@@ -81,7 +81,7 @@ IsSocketErrorClosed(socket_error_t code) noexcept
* and this class hosts the buffer.
*/
class SocketErrorMessage {
#ifdef WIN32
#ifdef _WIN32
char msg[256];
#else
const char *const msg;
@@ -99,7 +99,7 @@ gcc_const
static inline std::system_error
MakeSocketError(socket_error_t code, const char *msg) noexcept
{
#ifdef WIN32
#ifdef _WIN32
return MakeLastError(code, msg);
#else
return MakeErrno(code, msg);

2
src/net/StaticSocketAddress.cxx
View File

@@ -35,7 +35,7 @@
#include <string.h>
#ifdef HAVE_TCP
#ifdef WIN32
#ifdef _WIN32
#include <ws2tcpip.h>
#else
#include <netinet/in.h>

2
src/net/ToString.cxx
View File

@@ -34,7 +34,7 @@
#include <algorithm>
#ifdef WIN32
#ifdef _WIN32
#include <ws2tcpip.h>
#else
#include <netdb.h>