[PATCH] Fix build failure on GNU/kFreeBSD

View: New views
2 Messages — Rating Filter:   Alert me  

[PATCH] Fix build failure on GNU/kFreeBSD

by Aurelien Jarno :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

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@...                 http://www.aurel32.net
_______________________________________________
hal mailing list
hal@...
http://lists.freedesktop.org/mailman/listinfo/hal

Re: [PATCH] Fix build failure on GNU/kFreeBSD

by Martin Pitt-4 :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Hello Aurelien,

Aurelien Jarno [2009-08-17 23:33 +0200]:
> As this code is shared between plain FreeBSD and GNU/kFreeBSD, the version
> check should also be done with __FreeBSD_kernel_version.

Applied, thanks!

Martin

--
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
_______________________________________________
hal mailing list
hal@...
http://lists.freedesktop.org/mailman/listinfo/hal