| Message ID | 20230323090859.25240-6-jgross@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tools: use xen-tools/libs.h for common definitions | expand |
On Thu, Mar 23, 2023 at 10:08:59AM +0100, Juergen Gross wrote: > vchan/init.c is defining offsetof privately. Remove that definition > and just use stddef.h instead. > > Signed-off-by: Juergen Gross <jgross@suse.com> Acked-by: Anthony PERARD <anthony.perard@citrix.com> Thanks,
diff --git a/tools/libs/vchan/init.c b/tools/libs/vchan/init.c index 021e1f29e1..a081dd4c9a 100644 --- a/tools/libs/vchan/init.c +++ b/tools/libs/vchan/init.c @@ -32,6 +32,7 @@ #include <sys/mman.h> #include <sys/ioctl.h> #include <sys/user.h> +#include <stddef.h> #include <stdlib.h> #include <stdio.h> #include <stdint.h> @@ -69,10 +70,6 @@ #define MAX_RING_SHIFT 20 #define MAX_RING_SIZE (1 << MAX_RING_SHIFT) -#ifndef offsetof -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) -#endif - static int init_gnt_srv(struct libxenvchan *ctrl, int domain) { int pages_left = ctrl->read.order >= PAGE_SHIFT ? 1 << (ctrl->read.order - PAGE_SHIFT) : 0;
vchan/init.c is defining offsetof privately. Remove that definition and just use stddef.h instead. Signed-off-by: Juergen Gross <jgross@suse.com> --- V4: - new patch --- tools/libs/vchan/init.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)