summaryrefslogtreecommitdiffstats
path: root/fdisk
diff options
context:
space:
mode:
authorSamuel Thibault2008-04-22 03:11:48 +0200
committerKarel Zak2008-07-24 00:52:52 +0200
commitca04a95a3b4ccc943dc3ba05fc0b885f74ba5645 (patch)
treed96b82c87dc7cbf6770a6c0586ba47d5db9376b5 /fdisk
parentmkswap: non-linux support (diff)
downloadkernel-qcow2-util-linux-ca04a95a3b4ccc943dc3ba05fc0b885f74ba5645.tar.gz
kernel-qcow2-util-linux-ca04a95a3b4ccc943dc3ba05fc0b885f74ba5645.tar.xz
kernel-qcow2-util-linux-ca04a95a3b4ccc943dc3ba05fc0b885f74ba5645.zip
fdisk: don't use get_linux_version() for non-linux
The get_linux_version() function is Linux-specific. Work around it in a few places. [kzak@redhat.com: split the original patch to small patches] Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisk')
-rw-r--r--fdisk/Makefile.am6
-rw-r--r--fdisk/sfdisk.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am
index 921563f8e..b3b5d7e9b 100644
--- a/fdisk/Makefile.am
+++ b/fdisk/Makefile.am
@@ -3,7 +3,11 @@ include $(top_srcdir)/config/include-Makefile.am
EXTRA_DIST = README.fdisk README.cfdisk sfdisk.examples partitiontype.c
fdisk_common = i386_sys_types.c common.h gpt.c gpt.h \
- ../lib/blkdev.c ../lib/linux_version.c
+ ../lib/blkdev.c
+
+if LINUX
+fdisk_common += ../lib/linux_version.c
+endif
if !ARCH_M68K
diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index a3b66174f..d737d69d1 100644
--- a/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@ -1508,7 +1508,10 @@ msdos_partition(char *dev, int fd, unsigned long start, struct disk_desc *z) {
struct sector *s;
struct part_desc *partitions = &(z->partitions[0]);
int pno = z->partno;
- int bsd_later = (get_linux_version() >= KERNEL_VERSION(2,3,40));
+ int bsd_later = 1;
+#ifdef __linux__
+ bsd_later = (get_linux_version() >= KERNEL_VERSION(2,3,40));
+#endif
if (!(s = get_sector(dev, fd, start)))
return 0;