merge from main

--HG--
branch : fuzz
This commit is contained in:
Matt Johnston
2017-06-24 00:47:07 +08:00
4 changed files with 77 additions and 8 deletions

View File

@@ -160,7 +160,7 @@ typedef u_int32_t uint32_t;
#define SIZE_T_MAX ULONG_MAX
#endif /* SIZE_T_MAX */
#ifdef SO_PRIORITY
#ifdef HAVE_LINUX_PKT_SCHED_H
#include <linux/types.h>
#include <linux/pkt_sched.h>
#endif