Skip to content

Commit

Permalink
Some additional FreeBSD fixes from Andrew Gallatin.
Browse files Browse the repository at this point in the history
  • Loading branch information
raj committed Aug 7, 2015
1 parent af09e8f commit 328fe3b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
3 changes: 2 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ calibration-free
fixes to configure to recognize Solaris 11
fixes to netcpu_procstat.c for later linux kernels
workarounds to get Linux to report ENOBUFS on TX queue overflows
FreeBSD fixes

Mark Cooper
pointing-out the need for -lresolv when compiling -DDO_DNS on RedHat
Expand Down Expand Up @@ -306,4 +307,4 @@ the UDP socket connected at the netserver side.

Weijia Song - a fix inspiration for a NULL pointer problem.

Gisle Vanem - some Windows compilation fixes
Gisle Vanem - some Windows compilation fixes
4 changes: 2 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -6567,7 +6567,7 @@ fi
done

case "$host" in
*-*-freebsd78.*)
*-*-freebsd[7-9].* | *-*-freebsd1[0-1].* )
# FreeBSD 7.x and later SCTP support doesn't need -lsctp.
;;
*)
Expand Down Expand Up @@ -7142,7 +7142,7 @@ ac_cv_lib_kstat=ac_cv_lib_kstat_main
enable_cpuutil="kstat - auto"
NETCPU_SOURCE="kstat"
;;
*-*-freebsd[4-8].* | *-*-netbsd[1-9].* )
*-*-freebsd[4-9].* | *-*-freebsd1[0-1].* | *-*-netbsd[1-9].* )
use_cpuutil=true

$as_echo "#define USE_SYSCTL /**/" >>confdefs.h
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ case "$enable_sctp" in
#include <sys/socket.h>
]])
case "$host" in
*-*-freebsd[78].*)
*-*-freebsd[[7-9]].* | *-*-freebsd1[[0-1]].* )
# FreeBSD 7.x and later SCTP support doesn't need -lsctp.
;;
*)
Expand Down Expand Up @@ -699,7 +699,7 @@ case "$enable_cpuutil" in
enable_cpuutil="kstat - auto"
NETCPU_SOURCE="kstat"
;;
*-*-freebsd[[4-8]].* | *-*-netbsd[[1-9]].* )
*-*-freebsd[[4-9]].* | *-*-freebsd1[[0-1]].* | *-*-netbsd[[1-9]].* )
use_cpuutil=true
AC_DEFINE([USE_SYSCTL],,[Use MumbleBSD's sysctl interface to measure CPU util.])
enable_cpuutil="sysctl - auto"
Expand Down
3 changes: 3 additions & 0 deletions src/dscp.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ const char * iptos2str(int iptos);
*/

#if HAVE_NETINET_IN_SYSTM_H
#if defined(__FreeBSD__)
#include <sys/types.h>
#endif
#include <netinet/in_systm.h>
#endif
#if HAVE_NETINET_IP_H
Expand Down

0 comments on commit 328fe3b

Please sign in to comment.