diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-03-05 00:24:02 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-03-05 00:24:02 +0000 |
| commit | 23053617b74f1bbb6c8ae3c60fe24953701a4583 (patch) | |
| tree | 8157f10d4aa92300aa140bd1a13f0ec833e18460 /cpp | |
| parent | d92398a20505c418297e68e9de6d77da59f9fbba (diff) | |
| download | qpid-python-23053617b74f1bbb6c8ae3c60fe24953701a4583.tar.gz | |
Remove socklen_t for Windows; related to QPID-1710
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@750253 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/src/qpid/sys/windows/IntegerTypes.h | 1 | ||||
| -rwxr-xr-x | cpp/src/qpid/sys/windows/Socket.cpp | 4 |
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) |