From 1bf5aae91391afc87a5360dddae99d519c67db2a Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Fri, 27 Apr 2007 17:46:16 +0000 Subject: [PATCH] Change some #include lines to search only standard system directories. --- WHATS_NEW | 1 + daemons/clvmd/clvmd-cman.c | 2 +- daemons/clvmd/clvmd-command.c | 4 ++-- daemons/clvmd/clvmd-gulm.c | 6 +++--- daemons/clvmd/clvmd.c | 2 +- daemons/clvmd/lvm-functions.c | 4 ++-- daemons/clvmd/system-lv.c | 8 ++++---- daemons/clvmd/tcp-comms.c | 2 +- daemons/dmeventd/plugins/mirror/dmeventd_mirror.c | 4 ++-- dmeventd/mirror/dmeventd_mirror.c | 4 ++-- lib/activate/activate.c | 2 +- lib/misc/lib.h | 2 +- make.tmpl.in | 2 +- 13 files changed, 22 insertions(+), 21 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 23d3bee81..01de3bbb6 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.25 - ================================= + Change some #include lines to search only standard system directories. Add devices/preferred_names config regex list for displayed device names. Free a temporary dir string in fcntl_lock_file() after use. Fix a dm_pool_destroy() in matcher_create(). diff --git a/daemons/clvmd/clvmd-cman.c b/daemons/clvmd/clvmd-cman.c index cb1732c2f..1250f4706 100644 --- a/daemons/clvmd/clvmd-cman.c +++ b/daemons/clvmd/clvmd-cman.c @@ -36,10 +36,10 @@ #include #include #include +#include #include "clvmd-comms.h" #include "clvm.h" -#include "libdlm.h" #include "log.h" #include "clvmd.h" #include "lvm-functions.h" diff --git a/daemons/clvmd/clvmd-command.c b/daemons/clvmd/clvmd-command.c index 2d137e6e9..0623c3a77 100644 --- a/daemons/clvmd/clvmd-command.c +++ b/daemons/clvmd/clvmd-command.c @@ -64,8 +64,9 @@ #include #include #include +#include +#include -#include "libdevmapper.h" #include "list.h" #include "locking.h" #include "log.h" @@ -73,7 +74,6 @@ #include "clvmd-comms.h" #include "clvm.h" #include "clvmd.h" -#include "libdlm.h" extern struct cluster_ops *clops; diff --git a/daemons/clvmd/clvmd-gulm.c b/daemons/clvmd/clvmd-gulm.c index eca6edea3..507cdfacf 100644 --- a/daemons/clvmd/clvmd-gulm.c +++ b/daemons/clvmd/clvmd-gulm.c @@ -40,9 +40,10 @@ #include #include #include +#include +#include +#include -#include "libdevmapper.h" -#include "ccs.h" #include "list.h" #include "locking.h" #include "log.h" @@ -51,7 +52,6 @@ #include "lvm-functions.h" #include "clvmd.h" #include "clvmd-gulm.h" -#include "libgulm.h" /* Hash list of nodes in the cluster */ static struct dm_hash_table *node_hash; diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c index 6a2938350..752bbbd7c 100644 --- a/daemons/clvmd/clvmd.c +++ b/daemons/clvmd/clvmd.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "clvmd-comms.h" #include "lvm-functions.h" @@ -44,7 +45,6 @@ #include "version.h" #include "clvmd.h" #include "refresh_clvmd.h" -#include "libdlm.h" #include "system-lv.h" #include "list.h" #include "log.h" diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c index 35b3e935f..56219ac20 100644 --- a/daemons/clvmd/lvm-functions.c +++ b/daemons/clvmd/lvm-functions.c @@ -30,11 +30,11 @@ #include #include #include +#include +#include -#include "libdevmapper.h" #include "list.h" #include "lvm-types.h" -#include "libdlm.h" #include "clvm.h" #include "clvmd-comms.h" #include "clvmd.h" diff --git a/daemons/clvmd/system-lv.c b/daemons/clvmd/system-lv.c index aa5459927..04c05fc3e 100644 --- a/daemons/clvmd/system-lv.c +++ b/daemons/clvmd/system-lv.c @@ -36,8 +36,11 @@ #include #include #include +#include +#ifdef HAVE_CCS +#include +#endif -#include "libdlm.h" #include "log.h" #include "list.h" #include "locking.h" @@ -45,9 +48,6 @@ #include "clvm.h" #include "clvmd-comms.h" #include "clvmd.h" -#ifdef HAVE_CCS -#include "ccs.h" -#endif #define SYSTEM_LV_FILESYSTEM "ext2" #define SYSTEM_LV_MOUNTPOINT "/tmp/.clvmd-XXXXXX" diff --git a/daemons/clvmd/tcp-comms.c b/daemons/clvmd/tcp-comms.c index fd36189bd..ffbfe92d0 100644 --- a/daemons/clvmd/tcp-comms.c +++ b/daemons/clvmd/tcp-comms.c @@ -34,8 +34,8 @@ #include #include #include +#include -#include "libdevmapper.h" #include "clvm.h" #include "clvmd-comms.h" #include "clvmd.h" diff --git a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c index 5a7f74390..decac02be 100644 --- a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c +++ b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c @@ -12,10 +12,10 @@ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "libdevmapper.h" -#include "libdevmapper-event.h" #include "lvm2cmd.h" +#include +#include #include #include #include diff --git a/dmeventd/mirror/dmeventd_mirror.c b/dmeventd/mirror/dmeventd_mirror.c index 5a7f74390..decac02be 100644 --- a/dmeventd/mirror/dmeventd_mirror.c +++ b/dmeventd/mirror/dmeventd_mirror.c @@ -12,10 +12,10 @@ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "libdevmapper.h" -#include "libdevmapper-event.h" #include "lvm2cmd.h" +#include +#include #include #include #include diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 8084f5e97..a78c6a105 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -168,7 +168,7 @@ int lvs_in_vg_activated(struct volume_group *vg) { return 0; } -int lvs_in_vg_activated_by_uuid_only(struct volume_group *vg); +int lvs_in_vg_activated_by_uuid_only(struct volume_group *vg) { return 0; } diff --git a/lib/misc/lib.h b/lib/misc/lib.h index 1f9716528..c3d523185 100644 --- a/lib/misc/lib.h +++ b/lib/misc/lib.h @@ -19,7 +19,7 @@ #ifndef _LVM_LIB_H #define _LVM_LIB_H -#include +#include "configure.h" #define _REENTRANT #define _GNU_SOURCE diff --git a/make.tmpl.in b/make.tmpl.in index e1907e546..162f77f5e 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -94,7 +94,7 @@ STRIP= LIB_VERSION := $(shell cat $(top_srcdir)/VERSION | \ awk -F '.' '{printf "%s.%s",$$1,$$2}') -INCLUDES += -I. -I$(top_srcdir)/include +INCLUDES += -I$(top_srcdir)/include ifneq ("@DMDIR@", "") INCLUDES += -I@DMDIR@/include