diff options
| author | imp <imp@FreeBSD.org> | 2014-10-10 00:35:08 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-10-10 00:35:08 +0000 |
| commit | a2b4dd0675a6c16c348638791e6e1a47cc047997 (patch) | |
| tree | 219952cacb266ad0a38acd81b23d9a9e212594a6 /sys/ufs | |
| parent | f916cb9074c6bae2067718c2d50eb716679d571c (diff) | |
| download | FreeBSD-src-a2b4dd0675a6c16c348638791e6e1a47cc047997.zip FreeBSD-src-a2b4dd0675a6c16c348638791e6e1a47cc047997.tar.gz | |
Restore the backed-out change, using __offsetof instead.
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ufs/dir.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/ufs/ufs/dir.h b/sys/ufs/ufs/dir.h index 65f3ab1..574a32f 100644 --- a/sys/ufs/ufs/dir.h +++ b/sys/ufs/ufs/dir.h @@ -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) \ |
