]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
include/swapheader.h: ensure type sizes
authorSami Kerola <kerolasa@iki.fi>
Fri, 25 Apr 2014 21:08:23 +0000 (22:08 +0100)
committerKarel Zak <kzak@redhat.com>
Tue, 6 May 2014 08:12:14 +0000 (10:12 +0200)
Use consistently the same type sizes as in libblkid and kernel.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
include/swapheader.h

index c986202e3ea40fe142460b650b4800266da31f71..e56d93f3a1a6ba022ee3a3c22678c47a8a0ea34b 100644 (file)
@@ -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))