From owner-svn-src-stable@FreeBSD.ORG  Mon Jun  8 19:24:37 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DDCB21065690;
	Mon,  8 Jun 2009 19:24:37 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CC6838FC1E;
	Mon,  8 Jun 2009 19:24:37 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58JObJ0039760;
	Mon, 8 Jun 2009 19:24:37 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58JObsf039759;
	Mon, 8 Jun 2009 19:24:37 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200906081924.n58JObsf039759@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Mon, 8 Jun 2009 19:24:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193739 - stable/7/include
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 19:24:39 -0000

Author: des
Date: Mon Jun  8 19:24:37 2009
New Revision: 193739
URL: http://svn.freebsd.org/changeset/base/193739

Log:
  merge r173762: use a forward declaration to avoid an aliasing warning

Modified:
  stable/7/include/   (props changed)
  stable/7/include/dirent.h

Modified: stable/7/include/dirent.h
==============================================================================
--- stable/7/include/dirent.h	Mon Jun  8 19:22:12 2009	(r193738)
+++ stable/7/include/dirent.h	Mon Jun  8 19:24:37 2009	(r193739)
@@ -60,6 +60,7 @@
 #define	DIRBLKSIZ	1024
 
 struct _telldir;		/* see telldir.h */
+struct pthread_mutex;
 
 /* structure describing an open directory. */
 typedef struct _dirdesc {
@@ -71,7 +72,7 @@ typedef struct _dirdesc {
 	long	dd_seek;	/* magic cookie returned by getdirentries */
 	long	dd_rewind;	/* magic cookie for rewinding */
 	int	dd_flags;	/* flags for readdir */
-	void	*dd_lock;	/* hack to avoid including <pthread.h> */
+	struct pthread_mutex	*dd_lock;	/* lock */
 	struct _telldir *dd_td;	/* telldir position recording */
 } DIR;