From: Matthias Koenig <mkoenig@suse.de>
Date: Thu, 27 Nov 2008 11:32:55 +0000 (+0100)
Subject: include: move swapheader.h to include
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d60819b36d1a9fcb6c0f9678b6549cd7810d0943;p=util-linux

include: move swapheader.h to include

[kzak@redhat.com: add ifndef _SWAPHEADER_H]

Signed-off-by: Matthias Koenig <mkoenig@suse.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index f2d62452..c005ed59 100644
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -12,7 +12,7 @@ sbin_PROGRAMS = mkfs mkswap fsck.minix mkfs.minix mkfs.bfs
 fsck_minix_SOURCES = fsck.minix.c bitops.h minix.h
 mkfs_minix_SOURCES = mkfs.minix.c bitops.h minix.h $(utils_common)
 mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common)
-mkswap_SOURCES = mkswap.c swapheader.h $(utils_common)
+mkswap_SOURCES = mkswap.c $(utils_common)
 
 usrbinexec_PROGRAMS = isosize
 usrsbinexec_PROGRAMS =
diff --git a/disk-utils/swapheader.h b/include/swapheader.h
similarity index 87%
rename from disk-utils/swapheader.h
rename to include/swapheader.h
index 9411e3d2..6ff5390f 100644
--- a/disk-utils/swapheader.h
+++ b/include/swapheader.h
@@ -1,3 +1,6 @@
+#ifndef _SWAPHEADER_H
+#define _SWAPHEADER_H
+
 struct swap_header_v1 {
         char         bootbits[1024];    /* Space for disklabel etc. */
 	unsigned int version;
@@ -17,3 +20,5 @@ struct swap_header_v1_2 {
 	unsigned int  padding[117];
 	unsigned int  badpages[1];
 };
+
+#endif /* _SWAPHEADER_H */