mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2024-11-27 08:10:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Define and use offsetin() instead of offsetof()

Browse Source 
New macro which defines the offset on an object rather than a
type. This macro, as far as I know, ought to be fully portable, unlike
the fallback version of offsetof().

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin (Intel) 2018-12-14 00:27:59 -08:00
parent 374312cde4
commit ce19a52a34
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/compiler.h
View File

@ -180,6 +180,13 @@ typedef enum bool { false, true } bool;
# define offsetof(t,m) ((size_t)&(((t *)0)->m))
#endif
/* This is like offsetof(), but takes an object rather than a type.
Ironically enough this is actually guaranteed to be portable,
as far as I know... */
#ifndef offsetin
# define offsetin(p,m) ((const char *)&((p).m) - (const char *)&(p))
#endif
/* The container_of construct: if p is a pointer to member m of
container class c, then return a pointer to the container of which
*p is a member. */

2
nasmlib/strlist.c
View File

@ -108,7 +108,7 @@ strlist_vprintf(struct strlist *list, const char *fmt, va_list ap)
if (!list)
return NULL;
e = nasm_vaxprintf(offsetof(struct strlist_entry, str), fmt, ap);
e = nasm_vaxprintf(offsetin(*e, str), fmt, ap);
e->size = nasm_aprintf_size();
if (list->uniq) {