summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Koenig2008-11-27 12:32:55 +0100
committerKarel Zak2008-12-05 11:51:40 +0100
commitd60819b36d1a9fcb6c0f9678b6549cd7810d0943 (patch)
tree22be16daee8ffe31da59e979376a23c73a4fbafd
parentmount: remove spurious newline from mount.8 (diff)
downloadkernel-qcow2-util-linux-d60819b36d1a9fcb6c0f9678b6549cd7810d0943.tar.gz
kernel-qcow2-util-linux-d60819b36d1a9fcb6c0f9678b6549cd7810d0943.tar.xz
kernel-qcow2-util-linux-d60819b36d1a9fcb6c0f9678b6549cd7810d0943.zip
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>
-rw-r--r--disk-utils/Makefile.am2
-rw-r--r--include/swapheader.h (renamed from disk-utils/swapheader.h)5
2 files changed, 6 insertions, 1 deletions
diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index f2d624527..c005ed590 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
index 9411e3d2d..6ff5390f5 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 */