Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-16 00:00:07 +01:00
Code Issues Releases Wiki Activity

Recognize Debian GNU/kFreeBSD as FreeBSD-ish.

Browse source 
Some of the FreeBSD-specific code in libwebsockets is related to
the FreeBSD kernel, not the general build environment.  Thus, it is
important to make this distinction, especially when building on
platforms that have a FreeBSD kernel and a non-FreeBSD userland build
environment, such as Debian GNU/kFreeBSD.

When checking for FreeBSD kernel features, also check for the newly
introduced __FreeBSD_kernel__ preprocessor constant; it is present in
the GNU/kFreeBSD kernel and also in FreeBSD itself since the 9.1 release
about three years ago.
This commit is contained in:
Peter Pentchev 2015-12-25 13:35:40 +02:00
parent de132b94b1
commit ec2754a477
1 changed files with 9 additions and 3 deletions

12
lib/lws-plat-unix.c
View file

@ -201,7 +201,9 @@ lws_plat_set_socket_options(struct lws_context *context, int fd)
int optval = 1; int optval = 1;
socklen_t optlen = sizeof(optval); socklen_t optlen = sizeof(optval);
#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ #if defined(__APPLE__) || \
defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
defined(__NetBSD__) || \
defined(__OpenBSD__) defined(__OpenBSD__)
struct protoent *tcp_proto; struct protoent *tcp_proto;
#endif #endif
@ -213,7 +215,9 @@ lws_plat_set_socket_options(struct lws_context *context, int fd)
(const void *)&optval, optlen) < 0) (const void *)&optval, optlen) < 0)
return 1; return 1;
#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ #if defined(__APPLE__) || \
defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
defined(__NetBSD__) || \
defined(__CYGWIN__) || defined(__OpenBSD__) defined(__CYGWIN__) || defined(__OpenBSD__)
/* /*
@ -241,7 +245,9 @@ lws_plat_set_socket_options(struct lws_context *context, int fd)
/* Disable Nagle */ /* Disable Nagle */
optval = 1; optval = 1;
#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \ #if !defined(__APPLE__) && \
!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && \
!defined(__NetBSD__) && \
!defined(__OpenBSD__) !defined(__OpenBSD__)
if (setsockopt(fd, SOL_TCP, TCP_NODELAY, (const void *)&optval, optlen) < 0) if (setsockopt(fd, SOL_TCP, TCP_NODELAY, (const void *)&optval, optlen) < 0)
return 1; return 1;