osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Jörg Mayer 2014-01-02 15:17:14 +00:00
parent 2db085d864
commit be849dcaad
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
filetap/CMakeLists.txt
View File

@ -25,7 +25,7 @@ include(UseABICheck)
set(CLEAN_FILES set(CLEAN_FILES
buffer.c buffer.c
file_wrappers.c ft_file_wrappers.c
ftap.c ftap.c
) )

4
filetap/Makefile.common
View File

@ -31,12 +31,12 @@
NONGENERATED_C_FILES = \ NONGENERATED_C_FILES = \
buffer.c \ buffer.c \
file_access.c \ file_access.c \
file_wrappers.c \ ft_file_wrappers.c \
ftap.c ftap.c
# Header files that are not generated from other files # Header files that are not generated from other files
NONGENERATED_HEADER_FILES = \ NONGENERATED_HEADER_FILES = \
buffer.h \ buffer.h \
file_wrappers.h \ ft_file_wrappers.h \
ftap.h \ ftap.h \
ftap-int.h ftap-int.h

2
filetap/file_access.c
View File

@ -39,7 +39,7 @@
#include <wsutil/file_util.h> #include <wsutil/file_util.h>
#include "ftap-int.h" #include "ftap-int.h"
#include "file_wrappers.h" #include "ft_file_wrappers.h"
#include "buffer.h" #include "buffer.h"
/* /*

4
filetap/file_wrappers.c → filetap/ft_file_wrappers.c
View File

@ -1,4 +1,4 @@
/* file_wrappers.c /* ft_file_wrappers.c
* *
* $Id$ * $Id$
* *
@ -54,7 +54,7 @@
#endif /* HAVE_FCNTL_H */ #endif /* HAVE_FCNTL_H */
#include <string.h> #include <string.h>
#include "ftap-int.h" #include "ftap-int.h"
#include "file_wrappers.h" #include "ft_file_wrappers.h"
#include <wsutil/file_util.h> #include <wsutil/file_util.h>
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ

2
filetap/file_wrappers.h → filetap/ft_file_wrappers.h
View File

@ -1,4 +1,4 @@
/* file_wrappers.h /* ft_file_wrappers.h
* *
* $Id$ * $Id$
* *

2
filetap/ftap.c
View File

@ -39,7 +39,7 @@
#include "ftap-int.h" #include "ftap-int.h"
#include "file_wrappers.h" #include "ft_file_wrappers.h"
#include <wsutil/file_util.h> #include <wsutil/file_util.h>
#include "buffer.h" #include "buffer.h"