diff options
| author | Danny Kukawka <danny.kukawka@web.de> | 2006-08-15 13:28:06 +0200 |
|---|---|---|
| committer | Danny Kukawka <danny.kukawka@web.de> | 2006-08-15 13:28:06 +0200 |
| commit | 9ea9b86c3e44696da508326d2656b3988f883321 (patch) | |
| tree | 7c27d26bce08fc94bbe5d71bed165b2aa7953864 | |
| parent | 87698568312d659ac244898257d5ee8ee36ceac0 (diff) | |
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.
| -rw-r--r-- | hald/linux2/blockdev.c | 2 | ||||
| -rw-r--r-- | hald/util.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/hald/linux2/blockdev.c b/hald/linux2/blockdev.c index f01787da..5cbf025a 100644 --- a/hald/linux2/blockdev.c +++ b/hald/linux2/blockdev.c @@ -1206,7 +1206,7 @@ force_unmount (HalDevice *d, void *end_token) 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 9a3fca09..8f3233be 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> |