diff options
| author | Renato Botelho <renato@netgate.com> | 2016-11-02 10:47:11 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-11-02 10:47:11 -0200 |
| commit | 3c84ef4df7f599fdf9db66521c3d33c167458687 (patch) | |
| tree | 95795d4a6304e89128b277db8769df4a7d074fa4 /include | |
| parent | eb2387fb3f25275b8ca223e3c464563294982bde (diff) | |
| parent | 3944e88fda9dc9f4f391a06b18cd7583f783e8ec (diff) | |
| download | FreeBSD-src-3c84ef4df7f599fdf9db66521c3d33c167458687.zip FreeBSD-src-3c84ef4df7f599fdf9db66521c3d33c167458687.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile | 11 | ||||
| -rw-r--r-- | include/search.h | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/Makefile b/include/Makefile index 1c2bf39..449cdf4 100644 --- a/include/Makefile +++ b/include/Makefile @@ -236,6 +236,17 @@ copies: cd ${.CURDIR}/../sys/rpc; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 types.h \ ${DESTDIR}${INCLUDEDIR}/rpc +.if ${MK_CDDL} != "no" + cd ${.CURDIR}/../cddl/contrib/opensolaris/lib/libzfs_core/common; \ + ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 libzfs_core.h \ + ${DESTDIR}${INCLUDEDIR} + cd ${.CURDIR}/../cddl/contrib/opensolaris/lib/libnvpair; \ + ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 libnvpair.h \ + ${DESTDIR}${INCLUDEDIR} + cd ${.CURDIR}/../sys/cddl/contrib/opensolaris/uts/common/sys; \ + ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 nvpair.h \ + ${DESTDIR}${INCLUDEDIR}/sys +.endif symlinks: @${ECHO} "Setting up symlinks to kernel source tree..." diff --git a/include/search.h b/include/search.h index 4e4606f..40b736a 100644 --- a/include/search.h +++ b/include/search.h @@ -43,6 +43,8 @@ struct que_elem { struct que_elem *next; struct que_elem *prev; }; +#else +typedef void posix_tnode; #endif __BEGIN_DECLS |
