libsysprof-capture: Use offsetof() rather than G_STRUCT_OFFSET()

It does the same for modern compilers.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Helps: #40
This commit is contained in:
Philip Withnall
2020-07-02 11:00:14 +01:00
parent 284b5fd7cf
commit 3446628cec
2 changed files with 4 additions and 4 deletions

View File

@ -366,7 +366,7 @@ sysprof_capture_writer_cat (SysprofCaptureWriter *self,
frame->frame.pid, frame->frame.pid,
frame->id, frame->id,
frame->metadata, frame->metadata,
frame->frame.len - G_STRUCT_OFFSET (SysprofCaptureMetadata, metadata)); frame->frame.len - offsetof (SysprofCaptureMetadata, metadata));
break; break;
} }

View File

@ -904,7 +904,7 @@ again:
ret = _sysprof_pwrite (self->fd, ret = _sysprof_pwrite (self->fd,
&end_time, &end_time,
sizeof (end_time), sizeof (end_time),
G_STRUCT_OFFSET (SysprofCaptureFileHeader, end_time)); offsetof (SysprofCaptureFileHeader, end_time));
if (ret < 0 && errno == EAGAIN) if (ret < 0 && errno == EAGAIN)
goto again; goto again;
@ -1341,7 +1341,7 @@ do_start:
ret = _sysprof_pwrite (self->fd, ret = _sysprof_pwrite (self->fd,
&start_time, &start_time,
sizeof (start_time), sizeof (start_time),
G_STRUCT_OFFSET (SysprofCaptureFileHeader, time)); offsetof (SysprofCaptureFileHeader, time));
if (ret < 0 && errno == EAGAIN) if (ret < 0 && errno == EAGAIN)
goto do_start; goto do_start;
@ -1350,7 +1350,7 @@ do_end:
ret = _sysprof_pwrite (self->fd, ret = _sysprof_pwrite (self->fd,
&end_time, &end_time,
sizeof (end_time), sizeof (end_time),
G_STRUCT_OFFSET (SysprofCaptureFileHeader, end_time)); offsetof (SysprofCaptureFileHeader, end_time));
if (ret < 0 && errno == EAGAIN) if (ret < 0 && errno == EAGAIN)
goto do_end; goto do_end;