diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-11-06 19:20:37 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-11-07 21:52:23 +0000 |
| commit | 0162e54075bb7ad967a85736b3c8addd53d86de5 (patch) | |
| tree | 8a621af4c54f0d11b610b6842c9f53aae849e68a /mergecap.c | |
| parent | 24bfb7e35d619c004e0458f38a1d5ae538a898fb (diff) | |
Clean up includes of unistd.h, fcntl.h, and sys/stat.h.
Have wsutil/file_util.h include them on UN*X, just as it includes io.h
on Windows, so we can have a rule of "if you do file operations, include
<wsutil/file_util.h> and use the routines in it".
Remove includes of unistd.h, fcntl.h, and sys/stat.h that aren't
necessary (whether because of the addition of them to wsutil/file_util.h
or because they weren't needed in the first place).
Change-Id: Ie241dd74deff284e39a5f690a297dbb6e1dc485f
Reviewed-on: https://code.wireshark.org/review/11619
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mergecap.c b/mergecap.c index 16a2085f0f..146864dc89 100644 --- a/mergecap.c +++ b/mergecap.c @@ -30,10 +30,6 @@ #include <errno.h> #include <glib.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - #ifdef HAVE_GETOPT_H #include <getopt.h> #endif @@ -60,10 +56,6 @@ #include <wiretap/merge.h> #include <wiretap/pcap-encap.h> -#ifdef HAVE_FCNTL_H -#include <fcntl.h> -#endif - #ifdef _WIN32 #include <wsutil/unicode-utils.h> #endif /* _WIN32 */ |