From owner-cvs-src@FreeBSD.ORG Tue Mar 28 21:35:39 2006 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8ECF216A41F; Tue, 28 Mar 2006 21:35:39 +0000 (UTC) (envelope-from des@des.no) Received: from tim.des.no (tim.des.no [194.63.250.121]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0720243D45; Tue, 28 Mar 2006 21:35:39 +0000 (GMT) (envelope-from des@des.no) Received: from tim.des.no (localhost [127.0.0.1]) by spam.des.no (Postfix) with ESMTP id 3AB4E2096; Tue, 28 Mar 2006 23:35:34 +0200 (CEST) X-Spam-Tests: AWL,BAYES_00,FORGED_RCVD_HELO X-Spam-Learn: ham X-Spam-Score: -2.4/3.0 X-Spam-Checker-Version: SpamAssassin 3.1.1 (2006-03-10) on tim.des.no Received: from xps.des.no (des.no [80.203.243.180]) by tim.des.no (Postfix) with ESMTP id 296142081; Tue, 28 Mar 2006 23:35:34 +0200 (CEST) Received: by xps.des.no (Postfix, from userid 1001) id 05F6333C8D; Tue, 28 Mar 2006 23:08:28 +0200 (CEST) From: des@des.no (Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?=) To: Daniel Eischen References: Date: Tue, 28 Mar 2006 23:08:28 +0200 In-Reply-To: (Daniel Eischen's message of "Tue, 28 Mar 2006 15:25:59 -0500 (EST)") Message-ID: <86u09iuvjn.fsf@xps.des.no> User-Agent: Gnus/5.110003 (No Gnus v0.3) Emacs/21.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org, kris@obsecurity.org Subject: Re: cvs commit: src/lib/libc/include namespace.h un-namespace.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2006 21:35:39 -0000 Daniel Eischen writes: > I think this broke (at least) building libpthread. There are > several files in src/libpthread/thread/ that use these > namespace files. My bad. I shouldn't have committed this yet: the patch is correct, but requires other changes in libthr and libpthread. > Kris Kennaway wrote in a different thread: >> /usr/src/lib/libpthread/thread/thr_barrier.c:69: error: conflicting type= s for >> '_pthread_barrier_init' >> /usr/src/lib/libpthread/../../include/pthread.h:156: error: previous dec= laration of >> '_pthread_barrier_init' was here >> /usr/src/lib/libpthread/thread/thr_barrier.c:69: error: conflicting type= s for >> '_pthread_barrier_init' >> /usr/src/lib/libpthread/../../include/pthread.h:156: error: previous dec= laration of >> '_pthread_barrier_init' was here >> *** Error code 1 >> >> Those two declarations are: >> >> > int >> > _pthread_barrier_init(pthread_barrier_t *barrier, >> > const pthread_barrierattr_t *attr, int count) >> >> > int pthread_barrier_init(pthread_barrier_t *, >> > const pthread_barrierattr_t *, unsigned); >> >> What is odd is that I can't see how this suddenly broke. > > In order to keep the namespace changes, we need to remove the > use of [un-]namespace.h in these files and add separate declarations > for the needed _pthread_foo() functions in > libpthread/thread/thr_private.h. no, my commit did exactly what it was intended to do: the mismatch between prototype and definition is a bug that went undetected because the barrier functions were missing from {,un-}namespace.h. DES --=20 Dag-Erling Sm=F8rgrav - des@des.no