diff options
| author | Noah Watkins <noahwatkins@gmail.com> | 2013-07-20 18:41:39 -0700 |
|---|---|---|
| committer | Noah Watkins <noahwatkins@gmail.com> | 2013-09-17 10:08:45 -0700 |
| commit | 1688d64d905be9cf15d5fc7a9d69ae5774361c1e (patch) | |
| tree | fa3e018658eeaa31ed7cfd3b50c20b01b2915198 | |
| parent | 1f346b586bdb1a9d76ac56628a754f806028ce70 (diff) | |
| download | ceph-1688d64d905be9cf15d5fc7a9d69ae5774361c1e.tar.gz | |
pipe: avoid conflict with Pipe.cc on case-insensitive fs
pipe.c and Pipe.cc produce the same intermediate file names on
case-insensitive file systems (like HFS). This renames pipe.c/pipe.h in
order to avoid the conflict.
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
| -rw-r--r-- | src/common/Makefile.am | 4 | ||||
| -rw-r--r-- | src/common/OutputDataSocket.cc | 2 | ||||
| -rw-r--r-- | src/common/admin_socket.cc | 2 | ||||
| -rw-r--r-- | src/common/pipe_util.c (renamed from src/common/pipe.c) | 2 | ||||
| -rw-r--r-- | src/common/pipe_util.h (renamed from src/common/pipe.h) | 0 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 4c027909b4d..d6f7eb82763 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -32,7 +32,7 @@ libcommon_la_SOURCES = \ common/RefCountedObj.cc \ common/blkdev.cc \ common/common_init.cc \ - common/pipe.c \ + common/pipe_util.c \ common/ceph_argparse.cc \ common/ceph_context.cc \ common/buffer.cc \ @@ -166,7 +166,7 @@ noinst_HEADERS += \ common/arch.h \ common/armor.h \ common/common_init.h \ - common/pipe.h \ + common/pipe_util.h \ common/code_environment.h \ common/signal.h \ common/simple_spin.h \ diff --git a/src/common/OutputDataSocket.cc b/src/common/OutputDataSocket.cc index 3051ca02dbe..16fc86a1e88 100644 --- a/src/common/OutputDataSocket.cc +++ b/src/common/OutputDataSocket.cc @@ -20,7 +20,7 @@ #include "common/dout.h" #include "common/errno.h" #include "common/perf_counters.h" -#include "common/pipe.h" +#include "common/pipe_util.h" #include "common/safe_io.h" #include "common/version.h" #include "common/Formatter.h" diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc index 12e5868b409..eee24f8f1f7 100644 --- a/src/common/admin_socket.cc +++ b/src/common/admin_socket.cc @@ -21,7 +21,7 @@ #include "common/dout.h" #include "common/errno.h" #include "common/perf_counters.h" -#include "common/pipe.h" +#include "common/pipe_util.h" #include "common/safe_io.h" #include "common/version.h" #include "common/Formatter.h" diff --git a/src/common/pipe.c b/src/common/pipe_util.c index 9c01b322f89..b71e29265f8 100644 --- a/src/common/pipe.c +++ b/src/common/pipe_util.c @@ -12,7 +12,7 @@ * */ -#include "common/pipe.h" +#include "common/pipe_util.h" #include <errno.h> #include <fcntl.h> diff --git a/src/common/pipe.h b/src/common/pipe_util.h index b57ec0cafd8..b57ec0cafd8 100644 --- a/src/common/pipe.h +++ b/src/common/pipe_util.h |