Date: Mon, 8 Jun 2009 19:24:37 +0000 (UTC) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r193739 - stable/7/include Message-ID: <200906081924.n58JObsf039759@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906081924.n58JObsf039759>