From: Sami Kerola <kerolasa@iki.fi>
Date: Fri, 25 Apr 2014 21:08:23 +0000 (+0100)
Subject: include/swapheader.h: ensure type sizes
X-Git-Tag: v2.25-rc1~236
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d38b55375f7fceda03544c355e4b5350100029db;p=thirdparty%2Futil-linux.git

include/swapheader.h: ensure type sizes

Use consistently the same type sizes as in libblkid and kernel.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/include/swapheader.h b/include/swapheader.h
index c986202e3e..e56d93f3a1 100644
--- a/include/swapheader.h
+++ b/include/swapheader.h
@@ -5,15 +5,17 @@
 #define SWAP_UUID_LENGTH 16
 #define SWAP_LABEL_LENGTH 16
 
+#include <stdint.h>
+
 struct swap_header_v1_2 {
 	char	      bootbits[1024];    /* Space for disklabel etc. */
-	unsigned int  version;
-	unsigned int  last_page;
-	unsigned int  nr_badpages;
+	uint32_t      version;
+	uint32_t      last_page;
+	uint32_t      nr_badpages;
 	unsigned char uuid[SWAP_UUID_LENGTH];
 	char	      volume_name[SWAP_LABEL_LENGTH];
-	unsigned int  padding[117];
-	unsigned int  badpages[1];
+	uint32_t      padding[117];
+	uint32_t      badpages[1];
 };
 
 #define SWAP_HEADER_SIZE (sizeof(struct swap_header_v1_2))