You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2009/03/05 01:24:02 UTC
svn commit: r750253 - in /qpid/trunk/qpid/cpp/src/qpid/sys/windows:
IntegerTypes.h Socket.cpp
Author: shuston
Date: Thu Mar 5 00:24:02 2009
New Revision: 750253
URL: http://svn.apache.org/viewvc?rev=750253&view=rev
Log:
Remove socklen_t for Windows; related to QPID-1710
Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/windows/IntegerTypes.h
qpid/trunk/qpid/cpp/src/qpid/sys/windows/Socket.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/IntegerTypes.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/IntegerTypes.h?rev=750253&r1=750252&r2=750253&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/IntegerTypes.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/IntegerTypes.h Thu Mar 5 00:24:02 2009
@@ -32,7 +32,6 @@
// 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;
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/Socket.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Socket.cpp?rev=750253&r1=750252&r2=750253&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/Socket.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/Socket.cpp Thu Mar 5 00:24:02 2009
@@ -262,9 +262,9 @@
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)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org