Author: imp
Date: Fri Oct 10 00:35:08 2014
New Revision: 272880
URL: https://svnweb.freebsd.org/changeset/base/272880
Log:
Restore the backed-out change, using __offsetof instead.
Modified:
head/sys/ufs/ufs/dir.h
Modified: head/sys/ufs/ufs/dir.h
==============================================================================
--- head/sys/ufs/ufs/dir.h Fri Oct 10 00:28:19 2014 (r272879)
+++ head/sys/ufs/ufs/dir.h Fri Oct 10 00:35:08 2014 (r272880)
@@ -110,7 +110,7 @@ struct direct {
*
*/
#define DIRECTSIZ(namlen)
\
- (((uintptr_t)&((struct direct *)0)->d_name + \
+ ((__offsetof(struct direct, d_name) + \
((namlen)+1)*sizeof(((struct direct *)0)->d_name[0]) + 3) & ~3)
#if (BYTE_ORDER == LITTLE_ENDIAN)
#define DIRSIZ(oldfmt, dp) \
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
