[PATCH] Fix build failure on GNU/kFreeBSD

Aurelien Jarno aurelien at aurel32.net
Mon Aug 17 14:33:49 PDT 2009


As this code is shared between plain FreeBSD and GNU/kFreeBSD, the version
check should also be done with __FreeBSD_kernel_version.
---
 hald/freebsd/probing/probe-volume.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hald/freebsd/probing/probe-volume.c b/hald/freebsd/probing/probe-volume.c
index ee01927..7dce4ce 100644
--- a/hald/freebsd/probing/probe-volume.c
+++ b/hald/freebsd/probing/probe-volume.c
@@ -59,7 +59,7 @@ struct iso_path_table_entry
 };
 #define ISO_PATH_TABLE_ENTRY_SIZE         8
 
-#if __FreeBSD_version < 600101
+#if (__FreeBSD_version < 600101) && (__FreeBSD_kernel_version < 600101)
 static uint32_t
 isonum_731(unsigned char *p)
 {
-- 
1.6.1.3


-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien at aurel32.net                 http://www.aurel32.net


More information about the hal mailing list