# HG changeset patch # User Matt Johnston # Date 1498232193 -28800 # Node ID 89f8c59605273476395d2939fb200952049075ef # Parent 39aaf9f4d576be2fe9828d23321d4a61496ce54c test for linux/pkt-sched.h rather than SO_PRIORITY diff -r 39aaf9f4d576 -r 89f8c5960527 configure.ac --- a/configure.ac Fri Jun 23 23:21:20 2017 +0800 +++ b/configure.ac Fri Jun 23 23:36:33 2017 +0800 @@ -233,7 +233,11 @@ # Checks for header files. AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([fcntl.h limits.h netinet/in.h netinet/tcp.h stdlib.h string.h sys/socket.h sys/time.h termios.h unistd.h crypt.h pty.h ioctl.h libutil.h libgen.h inttypes.h stropts.h utmp.h utmpx.h lastlog.h paths.h util.h netdb.h security/pam_appl.h pam/pam_appl.h netinet/in_systm.h sys/uio.h]) +AC_CHECK_HEADERS([fcntl.h limits.h netinet/in.h netinet/tcp.h stdlib.h \ + string.h sys/socket.h sys/time.h termios.h unistd.h crypt.h \ + pty.h ioctl.h libutil.h libgen.h inttypes.h stropts.h utmp.h \ + utmpx.h lastlog.h paths.h util.h netdb.h security/pam_appl.h \ + pam/pam_appl.h netinet/in_systm.h sys/uio.h linux/pkt_sched.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff -r 39aaf9f4d576 -r 89f8c5960527 includes.h --- a/includes.h Fri Jun 23 23:21:20 2017 +0800 +++ b/includes.h Fri Jun 23 23:36:33 2017 +0800 @@ -156,7 +156,7 @@ typedef u_int32_t uint32_t; #endif /* HAVE_UINT32_T */ -#ifdef SO_PRIORITY +#ifdef HAVE_LINUX_PKT_SCHED_H #include #include #endif diff -r 39aaf9f4d576 -r 89f8c5960527 netio.c --- a/netio.c Fri Jun 23 23:21:20 2017 +0800 +++ b/netio.c Fri Jun 23 23:36:33 2017 +0800 @@ -306,7 +306,7 @@ #ifdef IPTOS_LOWDELAY int iptos_val = 0; #endif -#ifdef SO_PRIORITY +#ifdef HAVE_LINUX_PKT_SCHED_H int so_prio_val = 0; #endif @@ -333,7 +333,7 @@ } #endif -#ifdef SO_PRIORITY +#ifdef HAVE_LINUX_PKT_SCHED_H if (prio == DROPBEAR_PRIO_LOWDELAY) { so_prio_val = TC_PRIO_INTERACTIVE; } else if (prio == DROPBEAR_PRIO_BULK) {