From: Roger Pau Monne <roger.pau@citrix.com>
Date: Fri, 20 Jul 2018 08:32:42 +0000 (+0200)
Subject: lzma: fix tools build
X-Git-Tag: 4.12.0-rc1~925
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=95b62f9be3c5238ec54c63636ec0d81960074d32;p=xen.git

lzma: fix tools build

Remove local definition of MIN and instead include the kernel.h header
for the hypervisor build. Fixes the following error on the tools build:

In file included from xc_dom_decompress_unsafe_lzma.c:8:0:
../../xen/common/unlzma.c:33:0: error: "MIN" redefined [-Werror]
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 ^
In file included from xc_private.h:43:0,
                 from xg_private.h:29,
                 from xc_dom_decompress_unsafe_lzma.c:5:
/home/osstest/build.125458.build-amd64/xen/stubdom/libxc-x86_64/../../tools/include/xen-tools/libs.h:21:0: note: this is the location of the previous definition
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
 ^

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/common/unlzma.c b/xen/common/unlzma.c
index e072e21599..9134277bba 100644
--- a/xen/common/unlzma.c
+++ b/xen/common/unlzma.c
@@ -30,8 +30,6 @@
 
 #include "decompress.h"
 
-#define	MIN(a, b) (((a) < (b)) ? (a) : (b))
-
 static long long INIT read_int(unsigned char *ptr, int size)
 {
 	int i;
@@ -55,6 +53,7 @@ static long long INIT read_int(unsigned char *ptr, int size)
 
 #ifdef __XEN__
 #include <xen/compiler.h>
+#include <xen/kernel.h>
 #endif
 
 #define LZMA_IOBUF_SIZE	0x10000