From owner-svn-src-head@FreeBSD.ORG Fri Sep 3 17:35:29 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF46810656C1; Fri, 3 Sep 2010 17:35:29 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-qw0-f54.google.com (mail-qw0-f54.google.com [209.85.216.54]) by mx1.freebsd.org (Postfix) with ESMTP id 5EB658FC0A; Fri, 3 Sep 2010 17:35:29 +0000 (UTC) Received: by qwg5 with SMTP id 5so2169577qwg.13 for ; Fri, 03 Sep 2010 10:35:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=+3A3xDN22bCxRJuegxvNTIyfhpxzuLwTOmi++uqFx4Y=; b=rTlqGAzu+Ds5odG5bYQCrq+iAq8eR/G+KdpiVLDyaUDCFaZ8nlRHVa7e7NwTS7nUK4 9Ymrt8PZEqhYBSYxRYYlAEmiCEAUA44NpHOZygbEU+90ehU2aDzNMfyU5pAlKUYrXvIC 2wJVsIfEAVyKfW4S8W37cj72TkZzmsaETWOrk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=BmHOyJZrPjxlYSvZ0+mKlyy2YD+9RWVMNIq8PWoLJOB2xeHLNQCNvaKZCS7nqQTNnR IC/PqAqbkuxuCfIUYuc5HpxEF8ME2vG+cTJVA+6FIvDlYKETKU8ctEKcpCRwjkpTgMk4 FnCshe0uqoJk0yf/mkUzKrwMO1r0L+wILnpZU= MIME-Version: 1.0 Received: by 10.224.6.138 with SMTP id 10mr156084qaz.305.1283535328365; Fri, 03 Sep 2010 10:35:28 -0700 (PDT) Received: by 10.229.26.81 with HTTP; Fri, 3 Sep 2010 10:35:28 -0700 (PDT) In-Reply-To: <201009031723.o83HNR7k056625@svn.freebsd.org> References: <201009031723.o83HNR7k056625@svn.freebsd.org> Date: Fri, 3 Sep 2010 21:35:28 +0400 Message-ID: From: pluknet To: Matthew D Fleming Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r212182 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Sep 2010 17:35:30 -0000 On 3 September 2010 21:23, Matthew D Fleming wrote: > Author: mdf > Date: Fri Sep =A03 17:23:26 2010 > New Revision: 212182 > URL: http://svn.freebsd.org/changeset/base/212182 > > Log: > =A0Fix user-space libsbuf build. =A0Why isn't CTASSERT available to > =A0user-space? > > Modified: > =A0head/sys/kern/subr_sbuf.c > > Modified: head/sys/kern/subr_sbuf.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/kern/subr_sbuf.c =A0 Fri Sep =A03 16:12:39 2010 =A0 =A0 =A0 = =A0(r212181) > +++ head/sys/kern/subr_sbuf.c =A0 Fri Sep =A03 17:23:26 2010 =A0 =A0 =A0 = =A0(r212182) > @@ -116,8 +116,10 @@ _assert_sbuf_state(const char *fun, stru > > =A0#endif /* _KERNEL && INVARIANTS */ > > +#ifdef _KERNEL > =A0CTASSERT(powerof2(SBUF_MAXEXTENDSIZE)); > =A0CTASSERT(powerof2(SBUF_MAXEXTENDINCR)); > +#endif > > =A0static int > =A0sbuf_extendsize(int size) Hi, as I can see, the next (and maybe preferred) model is used in system header= s: #ifdef CTASSERT CTASSERT(...); #endif --=20 wbr, pluknet