From 1f5381c9ea3146512010c1374cb1730f8a30134a Mon Sep 17 00:00:00 2001 From: logwang Date: Tue, 5 Sep 2017 14:30:42 +0800 Subject: [PATCH] Fix compiling errors of tools. --- tools/compat/compat.h | 4 ---- tools/libutil/stub.c | 6 ++++++ tools/netstat/Makefile | 2 +- tools/netstat/netstat.h | 6 ++++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/tools/compat/compat.h b/tools/compat/compat.h index 4026179f..d814d65f 100644 --- a/tools/compat/compat.h +++ b/tools/compat/compat.h @@ -37,10 +37,6 @@ #define __dead __dead2 #endif -#ifndef __unused -#define __unused __attribute__((__unused__)) -#endif - #ifndef nitems #define nitems(x) (sizeof((x)) / sizeof((x)[0])) #endif diff --git a/tools/libutil/stub.c b/tools/libutil/stub.c index ec78a350..1ce28771 100644 --- a/tools/libutil/stub.c +++ b/tools/libutil/stub.c @@ -31,6 +31,12 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef FSTACK +#ifndef __unused +#define __unused __attribute__((__unused__)) +#endif +#endif + /* * Stub out what's in -lcrypt. */ diff --git a/tools/netstat/Makefile b/tools/netstat/Makefile index a625dac8..689ff3ca 100644 --- a/tools/netstat/Makefile +++ b/tools/netstat/Makefile @@ -13,7 +13,7 @@ CLEANFILES+= nl_symbols.c nl_defs.h CFLAGS+= -I${TOPDIR}/tools/libutil CFLAGS+= -I${TOPDIR}/tools/libmemstat -CFLAGS+= -I${TOPDIR}/tools/libxo/libxo +CFLAGS+= -I${TOPDIR}/tools/libxo LIBS+= -L${TOPDIR}/tools/libutil -lutil LIBS+= -L${TOPDIR}/tools/libmemstat -lmemstat diff --git a/tools/netstat/netstat.h b/tools/netstat/netstat.h index 4db28445..4fc7e768 100644 --- a/tools/netstat/netstat.h +++ b/tools/netstat/netstat.h @@ -32,6 +32,12 @@ #include +#ifdef FSTACK +#ifndef __unused +#define __unused __attribute__((__unused__)) +#endif +#endif + #define satosin(sa) ((struct sockaddr_in *)(sa)) #define satosin6(sa) ((struct sockaddr_in6 *)(sa)) #define sin6tosa(sin6) ((struct sockaddr *)(sin6))