Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/modules/zfs avoid duplicate symbols.



details:   https://anonhg.NetBSD.org/src/rev/3eef7b04abe3
branches:  trunk
changeset: 345980:3eef7b04abe3
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jun 18 21:45:05 2016 +0000

description:
avoid duplicate symbols.

diffstat:

 sys/modules/zfs/Makefile.zfsmod |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r e1201d5237d1 -r 3eef7b04abe3 sys/modules/zfs/Makefile.zfsmod
--- a/sys/modules/zfs/Makefile.zfsmod   Sat Jun 18 21:41:08 2016 +0000
+++ b/sys/modules/zfs/Makefile.zfsmod   Sat Jun 18 21:45:05 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.zfsmod,v 1.5 2014/04/22 15:12:52 christos Exp $
+#      $NetBSD: Makefile.zfsmod,v 1.6 2016/06/18 21:45:05 christos Exp $
 
 ZFSDIR=        ${S}/../external/cddl/osnet
 
@@ -18,7 +18,7 @@
 
 .PATH: ${ZFSDIR}/dist/uts/common/zmod
 
-SRCS+= trees.c
+#SRCS+= trees.c
 
 .PATH: ${ZFSDIR}/lib/libzpool
 
@@ -93,7 +93,7 @@
 SRCS+= zio_checksum.c
 SRCS+= zio_compress.c
 SRCS+= zio_inject.c
-SRCS+= zutil.c
+#SRCS+=        zutil.c
 SRCS+= zvol.c
 SRCS+= zle.c
 



Home | Main Index | Thread Index | Old Index