ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ws2_32: Allow binding to IrDA sockets if IrDA support is compiled in.

This commit is contained in:
Juan Lang 2009-08-12 09:14:27 -07:00 committed by Alexandre Julliard
parent 0ce420de73
commit 643466208b
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/ws2_32/socket.c
View File

@ -110,6 +110,14 @@
# define HAVE_IPX # define HAVE_IPX
#endif #endif
#ifdef HAVE_LINUX_IRDA_H
# ifdef HAVE_LINUX_TYPES_H
# include <linux/types.h>
# endif
# include <linux/irda.h>
# define HAVE_IRDA
#endif
#ifdef HAVE_POLL_H #ifdef HAVE_POLL_H
#include <poll.h> #include <poll.h>
#endif #endif
@ -852,11 +860,25 @@ static struct WS_protoent *check_buffer_pe(int size)
/* ----------------------------------- i/o APIs */ /* ----------------------------------- i/o APIs */
static inline BOOL supported_pf(int pf)
{
switch (pf)
{
case WS_AF_INET:
case WS_AF_INET6:
return TRUE;
#ifdef HAVE_IPX #ifdef HAVE_IPX
#define SUPPORTED_PF(pf) ((pf)==WS_AF_INET || (pf)== WS_AF_IPX || (pf) == WS_AF_INET6) case WS_AF_IPX:
#else return TRUE;
#define SUPPORTED_PF(pf) ((pf)==WS_AF_INET || (pf) == WS_AF_INET6)
#endif #endif
#ifdef HAVE_IRDA
case WS_AF_IRDA:
return TRUE;
#endif
default:
return FALSE;
}
}
/**********************************************************************/ /**********************************************************************/
@ -1425,7 +1447,7 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen)
if (fd != -1) if (fd != -1)
{ {
if (!name || (name->sa_family && !SUPPORTED_PF(name->sa_family))) if (!name || (name->sa_family && !supported_pf(name->sa_family)))
{ {
SetLastError(WSAEAFNOSUPPORT); SetLastError(WSAEAFNOSUPPORT);
} }