hal: Branch 'master'

[Danny Kukawka]

 hald/linux2/blockdev.c |    2 +-
 hald/util.c            |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree 9ea9b86c3e44696da508326d2656b3988f883321 (from 87698568312d659ac244898257d5ee8ee36ceac0)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Aug 15 13:28:06 2006 +0200

    fixed build of HAL
    
    Replaced in blockdev.c is_mounted_by_hald() with hal_util_is_mounted_by_hald
    and included <sys/file.h> in utils.c for flock().
    
    NOTE: Please run make or make dist before commit.

diff --git a/hald/linux2/blockdev.c b/hald/linux2/blockdev.c
index f01787d..5cbf025 100644
--- a/hald/linux2/blockdev.c
+++ b/hald/linux2/blockdev.c
@@ -1206,7 +1206,7 @@ force_unmount (HalDevice *d, void *end_t
 	mount_point = hal_device_property_get_string (d, "volume.mount_point");
 
 	/* look up in /media/.hal-mtab to see if we mounted this one */
-	if (mount_point != NULL && strlen (mount_point) > 0 && is_mounted_by_hald (mount_point)) {
+	if (mount_point != NULL && strlen (mount_point) > 0 && hal_util_is_mounted_by_hald (mount_point)) {
 		char *unmount_stdin;
 		char *extra_env[2];
 
diff --git a/hald/util.c b/hald/util.c
index 9a3fca0..8f3233b 100644
--- a/hald/util.c
+++ b/hald/util.c
@@ -39,6 +39,7 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/wait.h>
+#include <sys/file.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>