rename filetap/file_wrappers.[hc] -> filetap/ft_file_wrappers.[hc]

to avoid colliding include file names with wiretap/file_wrappers.h

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54554 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/filetap/CMakeLists.txt b/filetap/CMakeLists.txt
index ebb3357637ce4b7b0c96412634b0f784d1827a29..229c7e476f89808315c804ca3cef1f6ab39171a7 100644 (file)
--- 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 ce64c727593400dc6a13c0c28c4f368413ae8751..7988028e8658d1bb020c969ae3b8c9dc8b07d7bb 100644 (file)
--- 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 04689064069647e71b5cfe69f2f44b6d99fe0b4a..60b876725d0e52dbb2b25e6f54dd47539a7808f6 100644 (file)
--- 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
similarity index 99%
rename from filetap/file_wrappers.c
rename to filetap/ft_file_wrappers.c
index 854196739632372c3a2e859fbf0be5fc928b0334..25254ea9fffc0e59ef59c38137cd05bdac7362d4 100644 (file)
--- 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
similarity index 99%
rename from filetap/file_wrappers.h
rename to filetap/ft_file_wrappers.h
index 6bad0947385c3778ad79656da3efa964eac74d94..4583e5e4e9f867fbd677ad3536c6e14ff8c433a7 100644 (file)
--- 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 f3dd8c66aec2d67815a46f4c27316bec8d3c07f8..24fff82f158172372d9dba1c5261c5d8642e5090 100644 (file)
--- 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"