aboutsummaryrefslogtreecommitdiff
path: root/libXdmcp/Fill.c
diff options
context:
space:
mode:
Diffstat (limited to 'libXdmcp/Fill.c')
-rw-r--r--libXdmcp/Fill.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/libXdmcp/Fill.c b/libXdmcp/Fill.c
index 98c324f45..61cd974e9 100644
--- a/libXdmcp/Fill.c
+++ b/libXdmcp/Fill.c
@@ -36,24 +36,16 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xdmcp.h>
#include <stdlib.h>
-#ifdef STREAMSCONN
-#include <tiuser.h>
-#else
#ifdef WIN32
#include <X11/Xwinsock.h>
#else
#include <sys/socket.h>
#endif
-#endif
int
XdmcpFill (int fd, XdmcpBufferPtr buffer, XdmcpNetaddr from, int *fromlen)
{
BYTE *newBuf;
-#ifdef STREAMSCONN
- struct t_unitdata dataunit;
- int gotallflag, result;
-#endif
if (buffer->size < XDM_MAX_MSGLEN)
{
@@ -66,22 +58,8 @@ XdmcpFill (int fd, XdmcpBufferPtr buffer, XdmcpNetaddr from, int *fromlen)
}
}
buffer->pointer = 0;
-#ifdef STREAMSCONN
- dataunit.addr.buf = from;
- dataunit.addr.maxlen = *fromlen;
- dataunit.opt.maxlen = 0; /* don't care to know about options */
- dataunit.udata.buf = (char *)buffer->data;
- dataunit.udata.maxlen = buffer->size;
- result = t_rcvudata (fd, &dataunit, &gotallflag);
- if (result < 0) {
- return FALSE;
- }
- buffer->count = dataunit.udata.len;
- *fromlen = dataunit.addr.len;
-#else
buffer->count = recvfrom (fd, (char*)buffer->data, buffer->size, 0,
(struct sockaddr *)from, (void *)fromlen);
-#endif
if (buffer->count < 6) {
buffer->count = 0;
return FALSE;