From owner-freebsd-current Fri Jul 7 1:39: 1 2000 Delivered-To: freebsd-current@freebsd.org Received: from anchor-post-31.mail.demon.net (anchor-post-31.mail.demon.net [194.217.242.89]) by hub.freebsd.org (Postfix) with ESMTP id 52B5937B945; Fri, 7 Jul 2000 01:38:52 -0700 (PDT) (envelope-from n_hibma@qubesoft.com) Received: from calcaphon.demon.co.uk ([193.237.19.5] helo=bluebottle.qubesoft.com) by anchor-post-31.mail.demon.net with esmtp (Exim 2.12 #1) id 13ATe7-0005UC-0V; Fri, 7 Jul 2000 09:38:03 +0100 Received: from henny.webweaving.org (henny.qubesoft.com [192.168.1.5]) by bluebottle.qubesoft.com (8.9.3/8.9.1) with ESMTP id JAA85381; Fri, 7 Jul 2000 09:38:01 +0100 (BST) (envelope-from n_hibma@qubesoft.com) Received: from localhost (localhost [127.0.0.1]) by henny.webweaving.org (8.9.3/8.9.3) with ESMTP id JAA33815; Fri, 7 Jul 2000 09:16:33 +0100 (BST) (envelope-from n_hibma@qubesoft.com) Date: Fri, 7 Jul 2000 09:16:33 +0100 (BST) From: Nick Hibma X-Sender: n_hibma@localhost Reply-To: Nick Hibma To: John Baldwin Cc: Charles Anderson , FreeBSD Current , committers@FreeBSD.org Subject: Re: _DIAGASSERT in libusb & libutil In-Reply-To: <396529CC.6988EBE9@FreeBSD.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Fixed. Sorry. On Thu, 6 Jul 2000, John Baldwin wrote: > Charles Anderson wrote: > > > > # grep -r DIAGASSERT . (from /usr/src) > > ./lib/libutil/fparseln.c: _DIAGASSERT(sp != NULL); > > ./lib/libutil/fparseln.c: _DIAGASSERT(p != NULL); > > ./lib/libutil/fparseln.c: _DIAGASSERT(fp != NULL); > > ./lib/libusb/data.c: _DIAGASSERT(p != NULL); > > ./lib/libusb/data.c: _DIAGASSERT(h != NULL); > > ./lib/libusb/data.c: _DIAGASSERT(p != NULL); > > ./lib/libusb/data.c: _DIAGASSERT(h != NULL); > > ./lib/libusb/descr.c: _DIAGASSERT(fd != -1); > > ./lib/libusb/parse.c: _DIAGASSERT(c != NULL); > > ./lib/libusb/parse.c: _DIAGASSERT(d != NULL); > > ./lib/libusb/parse.c: _DIAGASSERT(s != NULL); > > ./lib/libusb/parse.c: _DIAGASSERT(s != NULL); > > ./lib/libusb/parse.c: _DIAGASSERT(h != NULL); > > ./lib/libusb/parse.c: _DIAGASSERT(r != NULL); > > ./lib/libusb/parse.c: _DIAGASSERT(desc != NULL); > > ./lib/libusb/parse.c: _DIAGASSERT(h != NULL); > > ./make.out.070600.1528:/usr/obj/usr/src/i386/usr/lib/libusb.so: undefined reference to `_DIAGASSERT' > > > > Where does _DIAGASSERT come from? I updated right before I built which was > > 3:30 edt > > It's a macro that NetBSD uses just to be different from the rest of the > known > world which uses the assert() macro from /usr/include/assert.h. In > libutil/fparseln.c, all the _DIAGASSERT() macro calls are #if 0/#endif'd > out. > A similar patch should fix libusb. > > -- > > John Baldwin -- http://www.FreeBSD.org/~jhb/ > PGP Key: http://www.cslab.vt.edu/~jobaldwi/pgpkey.asc > "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ > -- n_hibma@webweaving.org n_hibma@freebsd.org USB project http://www.etla.net/~n_hibma/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message