From ca04a95a3b4ccc943dc3ba05fc0b885f74ba5645 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 22 Apr 2008 02:11:48 +0100 Subject: [PATCH] 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 Signed-off-by: Karel Zak --- fdisk/Makefile.am | 6 +++++- fdisk/sfdisk.c | 5 ++++- lib/Makefile.am | 8 ++++++-- 3 files changed, 15 insertions(+), 4 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; diff --git a/lib/Makefile.am b/lib/Makefile.am index 0e1321edb..37205dcd6 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,8 +2,12 @@ include $(top_srcdir)/config/include-Makefile.am noinst_PROGRAMS = test_blkdev -test_blkdev_SOURCES = $(top_srcdir)/lib/blkdev.c \ - $(top_srcdir)/lib/linux_version.c +test_blkdev_SOURCES = $(top_srcdir)/lib/blkdev.c + +if LINUX +test_blkdev_SOURCES += $(top_srcdir)/lib/linux_version.c +endif + test_blkdev_CFLAGS = -DMAIN_TEST_BLKDEV