summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcpp/src/qpid/sys/windows/IntegerTypes.h1
-rwxr-xr-xcpp/src/qpid/sys/windows/Socket.cpp4
2 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/qpid/sys/windows/IntegerTypes.h b/cpp/src/qpid/sys/windows/IntegerTypes.h
index 80168fab88..4b72154cd0 100755
--- a/cpp/src/qpid/sys/windows/IntegerTypes.h
+++ b/cpp/src/qpid/sys/windows/IntegerTypes.h
@@ -32,7 +32,6 @@ typedef __int64 int64_t;
// Visual Studio doesn't define other common types, so set them up here too.
typedef int pid_t;
-typedef int socklen_t;
typedef unsigned int size_t;
typedef int ssize_t;
typedef unsigned int uint;
diff --git a/cpp/src/qpid/sys/windows/Socket.cpp b/cpp/src/qpid/sys/windows/Socket.cpp
index a9959bf43e..93059d03ef 100755
--- a/cpp/src/qpid/sys/windows/Socket.cpp
+++ b/cpp/src/qpid/sys/windows/Socket.cpp
@@ -262,9 +262,9 @@ int Socket::listen(uint16_t port, int backlog) const
return ntohs(name.sin_port);
}
-Socket* Socket::accept(struct sockaddr *addr, socklen_t *addrlen) const
+Socket* Socket::accept() const
{
- SOCKET afd = ::accept(impl->fd, addr, addrlen);
+ SOCKET afd = ::accept(impl->fd, 0, 0);
if (afd != INVALID_SOCKET)
return new Socket(new IOHandlePrivate(afd));
else if (WSAGetLastError() == EAGAIN)