From: Wen Congyang <wency@cn.fujitsu.com>
Date: Fri, 11 Jul 2014 03:32:33 +0000 (+0800)
Subject: libxl: Fix duplicate libxl_ctx typedef.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4666
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7bddc6b722bdd64475512bb18ca7b27dd550df3a;p=xen.git

libxl: Fix duplicate libxl_ctx typedef.

commit de18e4c038306aeeca53e6e63e563036cafef162 introduces a build error with
older gcc:

In file included from xl.c:31:
libxl.h:582: error: redefinition of typedef ‘libxl_ctx’
libxl.h:348: note: previous declaration of ‘libxl_ctx’ was here

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
[ ijc -- rewrote commit message ]
---

diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index e6e0301059..5ae6532bc8 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -579,8 +579,6 @@ typedef struct libxl__ctx libxl_ctx;
  */
 #define LIBXL_HAVE_CPUPOOL_NAME 1
 
-typedef struct libxl__ctx libxl_ctx;
-
 typedef uint8_t libxl_mac[6];
 #define LIBXL_MAC_FMT "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx"
 #define LIBXL_MAC_FMTLEN ((2*6)+5) /* 6 hex bytes plus 5 colons */