diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2014-01-02 15:17:14 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2014-01-02 15:17:14 +0000 |
| commit | be849dcaad553c31df22ec56c6251d78916bc2c3 (patch) | |
| tree | ad47c41fd7bca4aa5af05277b0d13aedeac505b5 /filetap | |
| parent | 2db085d86495f9fea4f142780b636220a8301868 (diff) | |
rename filetap/file_wrappers.[hc] -> filetap/ft_file_wrappers.[hc]
to avoid colliding include file names with wiretap/file_wrappers.h
svn path=/trunk/; revision=54554
Diffstat (limited to 'filetap')
| -rw-r--r-- | filetap/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | filetap/Makefile.common | 4 | ||||
| -rw-r--r-- | filetap/file_access.c | 2 | ||||
| -rw-r--r-- | filetap/ft_file_wrappers.c (renamed from filetap/file_wrappers.c) | 4 | ||||
| -rw-r--r-- | filetap/ft_file_wrappers.h (renamed from filetap/file_wrappers.h) | 2 | ||||
| -rw-r--r-- | filetap/ftap.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/filetap/CMakeLists.txt b/filetap/CMakeLists.txt index ebb3357637..229c7e476f 100644 --- a/filetap/CMakeLists.txt +++ b/filetap/CMakeLists.txt @@ -25,7 +25,7 @@ include(UseABICheck) set(CLEAN_FILES buffer.c - file_wrappers.c + ft_file_wrappers.c ftap.c ) diff --git a/filetap/Makefile.common b/filetap/Makefile.common index ce64c72759..7988028e86 100644 --- a/filetap/Makefile.common +++ b/filetap/Makefile.common @@ -31,12 +31,12 @@ NONGENERATED_C_FILES = \ buffer.c \ file_access.c \ - file_wrappers.c \ + ft_file_wrappers.c \ ftap.c # Header files that are not generated from other files NONGENERATED_HEADER_FILES = \ buffer.h \ - file_wrappers.h \ + ft_file_wrappers.h \ ftap.h \ ftap-int.h diff --git a/filetap/file_access.c b/filetap/file_access.c index 0468906406..60b876725d 100644 --- a/filetap/file_access.c +++ b/filetap/file_access.c @@ -39,7 +39,7 @@ #include <wsutil/file_util.h> #include "ftap-int.h" -#include "file_wrappers.h" +#include "ft_file_wrappers.h" #include "buffer.h" /* diff --git a/filetap/file_wrappers.c b/filetap/ft_file_wrappers.c index 8541967396..25254ea9ff 100644 --- a/filetap/file_wrappers.c +++ b/filetap/ft_file_wrappers.c @@ -1,4 +1,4 @@ -/* file_wrappers.c +/* ft_file_wrappers.c * * $Id$ * @@ -54,7 +54,7 @@ #endif /* HAVE_FCNTL_H */ #include <string.h> #include "ftap-int.h" -#include "file_wrappers.h" +#include "ft_file_wrappers.h" #include <wsutil/file_util.h> #ifdef HAVE_LIBZ diff --git a/filetap/file_wrappers.h b/filetap/ft_file_wrappers.h index 6bad094738..4583e5e4e9 100644 --- a/filetap/file_wrappers.h +++ b/filetap/ft_file_wrappers.h @@ -1,4 +1,4 @@ -/* file_wrappers.h +/* ft_file_wrappers.h * * $Id$ * diff --git a/filetap/ftap.c b/filetap/ftap.c index f3dd8c66ae..24fff82f15 100644 --- a/filetap/ftap.c +++ b/filetap/ftap.c @@ -39,7 +39,7 @@ #include "ftap-int.h" -#include "file_wrappers.h" +#include "ft_file_wrappers.h" #include <wsutil/file_util.h> #include "buffer.h" |