mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 07:57:22 +00:00
ntdll: Avoid using SOL_IPX to detect whether IPX is supported.
4.18+ Linux kernels remove support for IPX but keep SOL_IPX defined, which causes compilation errors as wine unconditionally uses IPX structures if this is the case. Instead check for IPX_MTU to determine IPX support as it is defined within the ipx.h header itself.
This commit is contained in:
parent
a0534afab0
commit
954bf9e050
|
@ -45,6 +45,7 @@
|
|||
|
||||
#ifdef HAVE_NETIPX_IPX_H
|
||||
# include <netipx/ipx.h>
|
||||
# define HAS_IPX
|
||||
#elif defined(HAVE_LINUX_IPX_H)
|
||||
# ifdef HAVE_ASM_TYPES_H
|
||||
# include <asm/types.h>
|
||||
|
@ -53,8 +54,6 @@
|
|||
# include <linux/types.h>
|
||||
# endif
|
||||
# include <linux/ipx.h>
|
||||
#endif
|
||||
#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS)
|
||||
# define HAS_IPX
|
||||
#endif
|
||||
|
||||
|
@ -2406,6 +2405,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
|
|||
break;
|
||||
}
|
||||
|
||||
#ifdef HAS_IPX
|
||||
#ifdef SOL_IPX
|
||||
case IOCTL_AFD_WINE_GET_IPX_PTYPE:
|
||||
return do_getsockopt( handle, io, SOL_IPX, IPX_TYPE, out_buffer, out_size );
|
||||
|
@ -2444,6 +2444,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
|
|||
return do_setsockopt( handle, io, 0, SO_DEFAULT_HEADERS, &value, sizeof(value) );
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef HAS_IRDA
|
||||
#define MAX_IRDA_DEVICES 10
|
||||
|
|
Loading…
Reference in a new issue