From owner-freebsd-threads@FreeBSD.ORG  Fri Aug 19 19:33:40 2005
Return-Path: <owner-freebsd-threads@FreeBSD.ORG>
X-Original-To: threads@FreeBSD.org
Delivered-To: freebsd-threads@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EB01616A46F;
	Fri, 19 Aug 2005 19:33:39 +0000 (GMT)
	(envelope-from stefan@fafoe.narf.at)
Received: from viefep13-int.chello.at (viefep13-int.chello.at [213.46.255.15])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C872143D46;
	Fri, 19 Aug 2005 19:33:38 +0000 (GMT)
	(envelope-from stefan@fafoe.narf.at)
Received: from wombat.fafoe.narf.at ([213.47.85.26]) by viefep13-int.chello.at
	(InterMail vM.6.01.04.04 201-2131-118-104-20050224) with ESMTP id
	<20050819193336.JDT26435.viefep13-int.chello.at@wombat.fafoe.narf.at>;
	Fri, 19 Aug 2005 21:33:36 +0200
Received: by wombat.fafoe.narf.at (Postfix, from userid 1001)
	id 716CC2FF; Fri, 19 Aug 2005 21:33:35 +0200 (CEST)
Date: Fri, 19 Aug 2005 21:33:35 +0200
From: Stefan Farfeleder <stefanf@FreeBSD.org>
To: standards@FreeBSD.org, threads@FreeBSD.org
Message-ID: <20050819193333.GF77069@wombat.fafoe.narf.at>
Mail-Followup-To: standards@FreeBSD.org, threads@FreeBSD.org
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="VS++wcV0S1rZb1Fb"
Content-Disposition: inline
User-Agent: Mutt/1.5.9i
Cc: 
Subject: <pthread.h>/2
X-BeenThere: freebsd-threads@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Threading on FreeBSD <freebsd-threads.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-threads>, 
	<mailto:freebsd-threads-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-threads>
List-Post: <mailto:freebsd-threads@freebsd.org>
List-Help: <mailto:freebsd-threads-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-threads>,
	<mailto:freebsd-threads-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Aug 2005 19:33:41 -0000


--VS++wcV0S1rZb1Fb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

any objections to this patch?  It moves the identifiers starting with
MUTEX_ into the BSD namespace.

Stefan

--VS++wcV0S1rZb1Fb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="pthread.h-3.diff"

Index: src/include/pthread.h
===================================================================
RCS file: /b/ncvs/src/include/pthread.h,v
retrieving revision 1.37
diff -u -r1.37 pthread.h
--- src/include/pthread.h	19 Aug 2005 08:37:16 -0000	1.37
+++ src/include/pthread.h	19 Aug 2005 19:23:37 -0000
@@ -130,12 +133,15 @@
 	PTHREAD_MUTEX_ERRORCHECK	= 1,	/* Default POSIX mutex */
 	PTHREAD_MUTEX_RECURSIVE		= 2,	/* Recursive mutex */
 	PTHREAD_MUTEX_NORMAL		= 3,	/* No error checking */
-	MUTEX_TYPE_MAX
+	PTHREAD_MUTEX_TYPE_MAX
 };
 
 #define PTHREAD_MUTEX_DEFAULT		PTHREAD_MUTEX_ERRORCHECK
+#if __BSD_VISIBLE
 #define MUTEX_TYPE_FAST			PTHREAD_MUTEX_NORMAL
 #define MUTEX_TYPE_COUNTING_FAST	PTHREAD_MUTEX_RECURSIVE
+#define MUTEX_TYPE_MAX			PTHREAD_MUTEX_TYPE_MAX
+#endif
 
 /*
  * Thread function prototype definitions:

--VS++wcV0S1rZb1Fb--