public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
To: cluster-cvs-relay@redhat.com
Subject: dlm: master - dlm_controld: fix header inclusion
Date: Tue, 09 Jun 2009 17:32:00 -0000 [thread overview]
Message-ID: <20090609173136.2D011120194@lists.fedorahosted.org> (raw)
Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=c8a0c09ab027104babf5584b7552b2053c8f72ba
Commit: c8a0c09ab027104babf5584b7552b2053c8f72ba
Parent: 49e4c5b6db1b041f9424bd4e6b11cd924231c441
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Tue Jun 9 19:30:27 2009 +0200
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Tue Jun 9 19:30:27 2009 +0200
dlm_controld: fix header inclusion
remove #include "clusterautoconfig.h" from all .c files
and include it directly from dlm_daemon.h at the very top.
also make sure that dlm_daemon is always the first included
header.
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
group/dlm_controld/action.c | 2 --
group/dlm_controld/config.c | 3 +--
group/dlm_controld/cpg.c | 2 --
group/dlm_controld/crc.c | 2 --
group/dlm_controld/deadlock.c | 2 --
group/dlm_controld/dlm_daemon.h | 2 ++
group/dlm_controld/logging.c | 2 --
group/dlm_controld/main.c | 2 --
group/dlm_controld/member_cman.c | 2 --
group/dlm_controld/netlink.c | 2 --
group/dlm_controld/pacemaker.c | 3 +--
group/dlm_controld/plock.c | 2 --
12 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/group/dlm_controld/action.c b/group/dlm_controld/action.c
index 54faec1..e4180d4 100644
--- a/group/dlm_controld/action.c
+++ b/group/dlm_controld/action.c
@@ -1,5 +1,3 @@
-#include "clusterautoconfig.h"
-
#include "dlm_daemon.h"
#include "config.h"
diff --git a/group/dlm_controld/config.c b/group/dlm_controld/config.c
index bd7b672..fb75eee 100644
--- a/group/dlm_controld/config.c
+++ b/group/dlm_controld/config.c
@@ -1,4 +1,4 @@
-#include "clusterautoconfig.h"
+#include "dlm_daemon.h"
#include <sys/types.h>
#include <asm/types.h>
@@ -23,7 +23,6 @@
#include <unistd.h>
#include <dirent.h>
-#include "dlm_daemon.h"
#include "config.h"
#include "ccs.h"
diff --git a/group/dlm_controld/cpg.c b/group/dlm_controld/cpg.c
index 6eced07..43b36fd 100644
--- a/group/dlm_controld/cpg.c
+++ b/group/dlm_controld/cpg.c
@@ -1,5 +1,3 @@
-#include "clusterautoconfig.h"
-
#include "dlm_daemon.h"
#include "config.h"
diff --git a/group/dlm_controld/crc.c b/group/dlm_controld/crc.c
index 4cde27b..ff8c1d3 100644
--- a/group/dlm_controld/crc.c
+++ b/group/dlm_controld/crc.c
@@ -1,5 +1,3 @@
-#include "clusterautoconfig.h"
-
#include "dlm_daemon.h"
static const uint32_t crc_32_tab[] = {
diff --git a/group/dlm_controld/deadlock.c b/group/dlm_controld/deadlock.c
index d213b7e..4671c8c 100644
--- a/group/dlm_controld/deadlock.c
+++ b/group/dlm_controld/deadlock.c
@@ -1,5 +1,3 @@
-#include "clusterautoconfig.h"
-
#include "dlm_daemon.h"
#include "config.h"
#include "libdlm.h"
diff --git a/group/dlm_controld/dlm_daemon.h b/group/dlm_controld/dlm_daemon.h
index 5c64933..2acd7a6 100644
--- a/group/dlm_controld/dlm_daemon.h
+++ b/group/dlm_controld/dlm_daemon.h
@@ -1,6 +1,8 @@
#ifndef __DLM_DAEMON_DOT_H__
#define __DLM_DAEMON_DOT_H__
+#include "clusterautoconfig.h"
+
#include <sys/types.h>
#include <asm/types.h>
#include <sys/uio.h>
diff --git a/group/dlm_controld/logging.c b/group/dlm_controld/logging.c
index a77eb2c..cfcacb0 100644
--- a/group/dlm_controld/logging.c
+++ b/group/dlm_controld/logging.c
@@ -1,5 +1,3 @@
-#include "clusterautoconfig.h"
-
#include "dlm_daemon.h"
#include "config.h"
#include "ccs.h"
diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c
index da6900c..a3cf7b4 100644
--- a/group/dlm_controld/main.c
+++ b/group/dlm_controld/main.c
@@ -1,5 +1,3 @@
-#include "clusterautoconfig.h"
-
#include "dlm_daemon.h"
#include "config.h"
#include <pthread.h>
diff --git a/group/dlm_controld/member_cman.c b/group/dlm_controld/member_cman.c
index a196b8b..6d2f0ca 100644
--- a/group/dlm_controld/member_cman.c
+++ b/group/dlm_controld/member_cman.c
@@ -1,5 +1,3 @@
-#include "clusterautoconfig.h"
-
#include "dlm_daemon.h"
#include "config.h"
#include <corosync/corotypes.h>
diff --git a/group/dlm_controld/netlink.c b/group/dlm_controld/netlink.c
index bdf329b..5a7c261 100644
--- a/group/dlm_controld/netlink.c
+++ b/group/dlm_controld/netlink.c
@@ -1,5 +1,3 @@
-#include "clusterautoconfig.h"
-
#include "dlm_daemon.h"
#include "config.h"
#include <linux/dlm.h>
diff --git a/group/dlm_controld/pacemaker.c b/group/dlm_controld/pacemaker.c
index 272270c..810c644 100644
--- a/group/dlm_controld/pacemaker.c
+++ b/group/dlm_controld/pacemaker.c
@@ -1,9 +1,8 @@
-#include "clusterautoconfig.h"
+#include "dlm_daemon.h"
#include <syslog.h>
#include "config.h"
-#include "dlm_daemon.h"
#include <glib.h>
#include <bzlib.h>
diff --git a/group/dlm_controld/plock.c b/group/dlm_controld/plock.c
index 5e978f9..957d749 100644
--- a/group/dlm_controld/plock.c
+++ b/group/dlm_controld/plock.c
@@ -1,5 +1,3 @@
-#include "clusterautoconfig.h"
-
#include "dlm_daemon.h"
#include "config.h"
reply other threads:[~2009-06-09 17:32 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090609173136.2D011120194@lists.fedorahosted.org \
--to=fabbione@fedoraproject.org \
--cc=cluster-cvs-relay@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).