From owner-cvs-src@FreeBSD.ORG Tue Mar 28 20:26:02 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 03CBA16A400; Tue, 28 Mar 2006 20:26:01 +0000 (UTC) (envelope-from deischen@freebsd.org) Received: from mail.ntplx.net (mail.ntplx.net [204.213.176.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42DBD43D5A; Tue, 28 Mar 2006 20:26:01 +0000 (GMT) (envelope-from deischen@freebsd.org) Received: from sea.ntplx.net (sea.ntplx.net [204.213.176.11]) by mail.ntplx.net (8.13.6/8.13.6/NETPLEX) with ESMTP id k2SKPxaW004192; Tue, 28 Mar 2006 15:26:00 -0500 (EST) Date: Tue, 28 Mar 2006 15:25:59 -0500 (EST) From: Daniel Eischen X-X-Sender: eischen@sea.ntplx.net To: Dag-Erling Smorgrav In-Reply-To: <200603281641.k2SGf7Sq040094@repoman.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Virus-Scanned: by AMaViS and Clam AntiVirus (mail.ntplx.net) 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 Reply-To: Daniel Eischen 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 20:26:02 -0000 On Tue, 28 Mar 2006, Dag-Erling Smorgrav wrote: > des 2006-03-28 16:41:06 UTC > > FreeBSD src repository > > Modified files: > lib/libc/include namespace.h un-namespace.h > Log: > Add a bunch of missing pthread functions, and move out-of-order functions. > > Revision Changes Path > 1.19 +64 -6 src/lib/libc/include/namespace.h > 1.16 +64 -7 src/lib/libc/include/un-namespace.h I think this broke (at least) building libpthread. There are several files in src/libpthread/thread/ that use these namespace files. Kris Kennaway wrote in a different thread: > On 7.0 during buildworld: > > /usr/src/lib/libpthread/thread/thr_barrier.c:69: error: conflicting types for > '_pthread_barrier_init' > /usr/src/lib/libpthread/../../include/pthread.h:156: error: previous declaration of > '_pthread_barrier_init' was here > /usr/src/lib/libpthread/thread/thr_barrier.c:69: error: conflicting types for > '_pthread_barrier_init' > /usr/src/lib/libpthread/../../include/pthread.h:156: error: previous declaration 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. -- DE