diff options
| author | sjg <sjg@FreeBSD.org> | 2014-05-08 23:54:15 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-05-08 23:54:15 +0000 |
| commit | ed3fc70bf5a8edaf648093b11acca450802244ef (patch) | |
| tree | 8ce0ddd0e6f508bd20c77429c448969589170fae /cddl/lib | |
| parent | d4e443e0426fee44056ba3c1123455666d083aef (diff) | |
| parent | a2e6be0add027bf3e713c0d56ba9715b83a01144 (diff) | |
| download | FreeBSD-src-ed3fc70bf5a8edaf648093b11acca450802244ef.zip FreeBSD-src-ed3fc70bf5a8edaf648093b11acca450802244ef.tar.gz | |
Merge from head
Diffstat (limited to 'cddl/lib')
| -rw-r--r-- | cddl/lib/Makefile | 2 | ||||
| -rw-r--r-- | cddl/lib/libdtrace/libproc_compat.h | 1 | ||||
| -rw-r--r-- | cddl/lib/libzfs/Makefile | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile index fef1383..634d70e 100644 --- a/cddl/lib/Makefile +++ b/cddl/lib/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= ${_drti} \ libavl \ diff --git a/cddl/lib/libdtrace/libproc_compat.h b/cddl/lib/libdtrace/libproc_compat.h index a561157..d796f34 100644 --- a/cddl/lib/libdtrace/libproc_compat.h +++ b/cddl/lib/libdtrace/libproc_compat.h @@ -54,7 +54,6 @@ #define Psetbkpt proc_bkptset #define Psetflags proc_setflags #define Pstate proc_state -#define Pstate proc_state #define Psymbol_iter_by_addr proc_iter_symbyaddr #define Punsetflags proc_clearflags #define Pupdate_maps(p) do { } while (0) diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index 5b6b47d..16660ac 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -14,6 +14,7 @@ SRCS= deviceid.c \ fsshare.c \ mkdirp.c \ mnttab.c \ + thread_pool.c \ zmount.c \ zone.c |
