From: Ian Jackson <Ian.Jackson@eu.citrix.com>
Date: Thu, 9 Jul 2015 17:06:02 +0000 (+0100)
Subject: bsd-sys-queue-h-seddery: Massage `offsetof'
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2818
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3b1fc24d4d6e89feed431d96c396a6a40b7a177c;p=xen.git

bsd-sys-queue-h-seddery: Massage `offsetof'

For some reason BSD's queue.h uses `__offsetof'.  It expects it to
work just like offsetof.  So use offsetof.

Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/include/xen-external/bsd-sys-queue-h-seddery b/tools/include/xen-external/bsd-sys-queue-h-seddery
index 7a957e3a10..3f8716d9ff 100755
--- a/tools/include/xen-external/bsd-sys-queue-h-seddery
+++ b/tools/include/xen-external/bsd-sys-queue-h-seddery
@@ -69,4 +69,6 @@ s/\b struct \s+ type \b/type/xg;
 
 s,^\#include.*sys/cdefs.*,/* $& */,xg;
 
+s,\b __offsetof \b ,offsetof,xg;
+
 s/\b( NULL )/0/xg;