[Sheepdog] [PATCH 3/5] rename proto.h to accord_proto.h
MORITA Kazutaka
morita.kazutaka at lab.ntt.co.jp
Wed Nov 2 18:08:11 CET 2011
We need to install this header to system, so we shouldn't use a
generic file name.
Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
---
conductor/acrdnet.c | 2 +-
conductor/acrdops.c | 2 +-
include/accord.h | 2 +-
include/{proto.h => accord_proto.h} | 6 +++---
include/net.h | 2 +-
lib/net.c | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
rename include/{proto.h => accord_proto.h} (98%)
diff --git a/conductor/acrdnet.c b/conductor/acrdnet.c
index 9a9df95..4f2c731 100644
--- a/conductor/acrdnet.c
+++ b/conductor/acrdnet.c
@@ -19,7 +19,7 @@
#include <assert.h>
#include <errno.h>
-#include "proto.h"
+#include "accord_proto.h"
#include "list.h"
#include "work.h"
#include "logger.h"
diff --git a/conductor/acrdops.c b/conductor/acrdops.c
index a2c8e4e..8ec950d 100644
--- a/conductor/acrdops.c
+++ b/conductor/acrdops.c
@@ -13,7 +13,7 @@
#include <corosync/cpg.h>
#include "store.h"
-#include "proto.h"
+#include "accord_proto.h"
#include "logger.h"
#include "util.h"
#include "acrd_priv.h"
diff --git a/include/accord.h b/include/accord.h
index fb6219c..9a040f1 100644
--- a/include/accord.h
+++ b/include/accord.h
@@ -1,7 +1,7 @@
#ifndef __ACCORD_H__
#define __ACCORD_H__
-#include "proto.h"
+#include <accord_proto.h>
struct acrd_handle;
struct acrd_tx;
diff --git a/include/proto.h b/include/accord_proto.h
similarity index 98%
rename from include/proto.h
rename to include/accord_proto.h
index 12f973c..455b2e8 100644
--- a/include/proto.h
+++ b/include/accord_proto.h
@@ -1,5 +1,5 @@
-#ifndef __PROTO_H__
-#define __PROTO_H__
+#ifndef __ACCORD_PROTO_H__
+#define __ACCORD_PROTO_H__
#include "stdint.h"
#include "util.h"
@@ -244,4 +244,4 @@ static inline void *append_arg(void *p, const void *data, uint32_t data_len)
return hdr;
}
-#endif /* __PROTO_H__ */
+#endif /* __ACCORD_PROTO_H__ */
diff --git a/include/net.h b/include/net.h
index 7b10782..7bdebee 100644
--- a/include/net.h
+++ b/include/net.h
@@ -2,7 +2,7 @@
#define __NET_H__
#include <sys/socket.h>
-#include "proto.h"
+#include "accord_proto.h"
struct co_buffer {
int offset;
diff --git a/lib/net.c b/lib/net.c
index 0a8b426..a943e18 100644
--- a/lib/net.c
+++ b/lib/net.c
@@ -27,7 +27,7 @@
#include <sys/socket.h>
#include <coroutine.h>
-#include "proto.h"
+#include "accord_proto.h"
#include "util.h"
#include "event.h"
#include "net.h"
--
1.7.1
More information about the sheepdog
mailing list