From: Roger Pau Monne <roger.pau@citrix.com>
Date: Mon, 2 Jun 2014 15:08:22 +0000 (+0200)
Subject: hvmloader: remove size_t typedef and include stddef.h
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4814
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=51c9a2b93a47961532fb7561b8d6bf7c6f3d0e9d;p=xen.git

hvmloader: remove size_t typedef and include stddef.h

The open coded typedef of size_t was clashing with the typedef in
FreeBSD headers. Remove the typedef and include the proper header
where size_t is defined (stddef.h).

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h
index 9ccb905dcb..46d32b99a4 100644
--- a/tools/firmware/hvmloader/util.h
+++ b/tools/firmware/hvmloader/util.h
@@ -3,6 +3,7 @@
 
 #include <stdarg.h>
 #include <stdint.h>
+#include <stddef.h>
 #include <xen/xen.h>
 #include <xen/hvm/hvm_info_table.h>
 
@@ -174,7 +175,6 @@ int printf(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
 int vprintf(const char *fmt, va_list ap);
 
 /* Buffer output */
-typedef unsigned long size_t;
 int snprintf(char *buf, size_t size, const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
 
 /* Populate specified memory hole with RAM. */