forked from osmocom/wireshark
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:
parent
2db085d864
commit
be849dcaad
|
@ -25,7 +25,7 @@ include(UseABICheck)
|
|||
|
||||
set(CLEAN_FILES
|
||||
buffer.c
|
||||
file_wrappers.c
|
||||
ft_file_wrappers.c
|
||||
ftap.c
|
||||
)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
||||
/*
|
||||
|
|
|
@ -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
|
|
@ -1,4 +1,4 @@
|
|||
/* file_wrappers.h
|
||||
/* ft_file_wrappers.h
|
||||
*
|
||||
* $Id$
|
||||
*
|
|
@ -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"
|
||||
|
||||
|
|
Loading…
Reference in New Issue