diff options
| author | Artem Kachitchkine <artem.kachitchkin@sun.com> | 2006-08-14 22:41:30 -0700 |
|---|---|---|
| committer | Artem Kachitchkine <artem.kachitchkin@sun.com> | 2006-08-14 22:41:30 -0700 |
| commit | 87698568312d659ac244898257d5ee8ee36ceac0 (patch) | |
| tree | afcc9fb60b19b79b38b671b05db0e7de31af7f8e /tools | |
| parent | aa84d37830b9fdf140db88d88edab548f6159f33 (diff) | |
share is_mounted_by_hald() and non-gcc nits
Moved linux2/blockdev.c:is_mounted_by_hald() to
util.c:hal_util_is_mounted_by_hald() so all backends can use it.
Fixed some compilation warnings when compiling with non-GNU
compiler and libc.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/hal-device.c | 2 | ||||
| -rw-r--r-- | tools/hal-storage-eject.c | 4 | ||||
| -rw-r--r-- | tools/hal-storage-mount.c | 4 | ||||
| -rw-r--r-- | tools/hal-storage-shared.h | 4 | ||||
| -rw-r--r-- | tools/hal-storage-unmount.c | 4 | ||||
| -rw-r--r-- | tools/hal_find_by_capability.c | 2 | ||||
| -rw-r--r-- | tools/hal_find_by_property.c | 2 | ||||
| -rw-r--r-- | tools/hal_get_property.c | 2 | ||||
| -rw-r--r-- | tools/hal_set_property.c | 2 | ||||
| -rw-r--r-- | tools/lshal.c | 2 |
11 files changed, 15 insertions, 15 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 888d03e3..bcfbf59c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = \ -DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \ -DPACKAGE_SCRIPT_DIR=\""$(datadir)/hal/scripts"\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -I$(top_srcdir) -I$(top_srcdir)/libhal \ + -I$(top_srcdir) -I$(top_srcdir)/libhal -I$(top_srcdir)/libhal-storage \ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @POLKIT_CFLAGS@ bin_PROGRAMS = \ diff --git a/tools/hal-device.c b/tools/hal-device.c index 9bc57a65..a37d2d6e 100644 --- a/tools/hal-device.c +++ b/tools/hal-device.c @@ -45,7 +45,7 @@ #endif #include <dbus/dbus.h> -#include <libhal/libhal.h> +#include <libhal.h> typedef struct { char *udi; diff --git a/tools/hal-storage-eject.c b/tools/hal-storage-eject.c index 6cb8ab42..516d078e 100644 --- a/tools/hal-storage-eject.c +++ b/tools/hal-storage-eject.c @@ -34,8 +34,8 @@ #include <sys/types.h> #include <unistd.h> -#include <libhal/libhal.h> -#include <libhal-storage/libhal-storage.h> +#include <libhal.h> +#include <libhal-storage.h> #ifdef HAVE_POLKIT #include <libpolkit.h> #endif diff --git a/tools/hal-storage-mount.c b/tools/hal-storage-mount.c index 37d7d6b5..3da83b81 100644 --- a/tools/hal-storage-mount.c +++ b/tools/hal-storage-mount.c @@ -49,8 +49,8 @@ #include <errno.h> #include <syslog.h> -#include <libhal/libhal.h> -#include <libhal-storage/libhal-storage.h> +#include <libhal.h> +#include <libhal-storage.h> #ifdef HAVE_POLKIT #include <libpolkit.h> #endif diff --git a/tools/hal-storage-shared.h b/tools/hal-storage-shared.h index 34b9f1ee..f87d5d18 100644 --- a/tools/hal-storage-shared.h +++ b/tools/hal-storage-shared.h @@ -24,8 +24,8 @@ #ifndef HAL_STORAGE_SHARED_H #define HAL_STORAGE_SHARED_H -#include <libhal/libhal.h> -#include <libhal-storage/libhal-storage.h> +#include <libhal.h> +#include <libhal-storage.h> #ifdef HAVE_POLKIT #include <libpolkit.h> #endif diff --git a/tools/hal-storage-unmount.c b/tools/hal-storage-unmount.c index 112adc20..d1239f70 100644 --- a/tools/hal-storage-unmount.c +++ b/tools/hal-storage-unmount.c @@ -48,8 +48,8 @@ #include <sys/types.h> #include <unistd.h> -#include <libhal/libhal.h> -#include <libhal-storage/libhal-storage.h> +#include <libhal.h> +#include <libhal-storage.h> #ifdef HAVE_POLKIT #include <libpolkit.h> #endif diff --git a/tools/hal_find_by_capability.c b/tools/hal_find_by_capability.c index a4b95ef1..20a7666e 100644 --- a/tools/hal_find_by_capability.c +++ b/tools/hal_find_by_capability.c @@ -33,7 +33,7 @@ #include <unistd.h> #include <getopt.h> -#include <libhal/libhal.h> +#include <libhal.h> /** Print out program usage. diff --git a/tools/hal_find_by_property.c b/tools/hal_find_by_property.c index 8c25710d..f9344fd3 100644 --- a/tools/hal_find_by_property.c +++ b/tools/hal_find_by_property.c @@ -33,7 +33,7 @@ #include <unistd.h> #include <getopt.h> -#include <libhal/libhal.h> +#include <libhal.h> /** Print out program usage. diff --git a/tools/hal_get_property.c b/tools/hal_get_property.c index 6df4a161..c2ec717d 100644 --- a/tools/hal_get_property.c +++ b/tools/hal_get_property.c @@ -33,7 +33,7 @@ #include <unistd.h> #include <getopt.h> -#include <libhal/libhal.h> +#include <libhal.h> /** * @defgroup HalGetProperty Get HAL device property diff --git a/tools/hal_set_property.c b/tools/hal_set_property.c index 7bb6094d..eaeb7fc5 100644 --- a/tools/hal_set_property.c +++ b/tools/hal_set_property.c @@ -34,7 +34,7 @@ #include <unistd.h> #include <getopt.h> -#include "libhal/libhal.h" +#include <libhal.h> static LibHalContext *hal_ctx; diff --git a/tools/lshal.c b/tools/lshal.c index c837c7f0..cb4fd157 100644 --- a/tools/lshal.c +++ b/tools/lshal.c @@ -38,7 +38,7 @@ #include <glib.h> #include <dbus/dbus-glib-lowlevel.h> #include <dbus/dbus-glib.h> -#include <libhal/libhal.h> +#include <libhal.h> #ifdef __SUNPRO_C #define __FUNCTION__ __func__ |