diff options
| author | Noah Watkins <noahwatkins@gmail.com> | 2013-07-20 18:41:39 -0700 |
|---|---|---|
| committer | Noah Watkins <noahwatkins@gmail.com> | 2013-07-20 18:41:39 -0700 |
| commit | 83ed2887ac720e437fc22c6249f9d5c31ae886a6 (patch) | |
| tree | bc4302f30124e7e346f04f74bb6b032214308b9e | |
| parent | f85824c86dec496762e36fb79fbd5c1953b191da (diff) | |
| download | ceph-83ed2887ac720e437fc22c6249f9d5c31ae886a6.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/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/Makefile.am b/src/Makefile.am index 234d084eaa0..b7ebeceead4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1539,7 +1539,7 @@ libcommon_files = \ mds/mdstypes.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 \ @@ -1824,7 +1824,7 @@ noinst_HEADERS = \ global/global_init.h \ global/global_context.h \ common/common_init.h\ - common/pipe.h\ + common/pipe_util.h\ common/code_environment.h \ common/signal.h\ global/signal_handler.h\ diff --git a/src/common/OutputDataSocket.cc b/src/common/OutputDataSocket.cc index e4d21fe13ee..dace2c149e3 100644 --- a/src/common/OutputDataSocket.cc +++ b/src/common/OutputDataSocket.cc @@ -18,7 +18,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 f7ab3501dff..2b03c7534b4 100644 --- a/src/common/admin_socket.cc +++ b/src/common/admin_socket.cc @@ -19,7 +19,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 |