diff --git a/cmd/zdb/Makefile.am b/cmd/zdb/Makefile.am index 0d64301eec..5a88fcc151 100644 --- a/cmd/zdb/Makefile.am +++ b/cmd/zdb/Makefile.am @@ -17,4 +17,11 @@ zdb_SOURCES = \ ${top_srcdir}/cmd/zdb/zdb_il.c zdb_LDADD = \ - $(top_builddir)/lib/libspl/libspl.la + $(top_builddir)/lib/libspl/libspl.la \ + $(top_builddir)/lib/libavl/libavl.la \ + $(top_builddir)/lib/libnvpair/libnvpair.la \ + $(top_builddir)/lib/libuutil/libuutil.la \ + $(top_builddir)/lib/libzpool/libzpool.la \ + $(top_builddir)/lib/libzfs/libzfs.la + +zdb_LDFLAGS = diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c index 5902084a9e..42ab2b416c 100644 --- a/cmd/zdb/zdb.c +++ b/cmd/zdb/zdb.c @@ -52,7 +52,6 @@ #include #include #undef ZFS_MAXNAMELEN -#undef verify #include const char cmdname[] = "zdb"; diff --git a/cmd/zdb/zdb_il.c b/cmd/zdb/zdb_il.c index 02d35a0503..9341e81c3d 100644 --- a/cmd/zdb/zdb_il.c +++ b/cmd/zdb/zdb_il.c @@ -225,7 +225,7 @@ zil_prt_rec_acl(zilog_t *zilog, int txtype, lr_acl_t *lr) (u_longlong_t)lr->lr_foid, (u_longlong_t)lr->lr_aclcnt); } -typedef void (*zil_prt_rec_func_t)(); +typedef void (*zil_prt_rec_func_t)(zilog_t *, int, lr_t *); typedef struct zil_rec_info { zil_prt_rec_func_t zri_print; char *zri_name;