osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

For non-libwiretap code, use <wiretap/XXX.h> to include libwiretap headers. 

That makes it clearer that they're libwiretap headers.

Change-Id: Ia78a3496913b901073ee59e62bfb72c1677450fa
Reviewed-on: https://code.wireshark.org/review/13064
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2016-01-05 14:20:57 -08:00
parent 5815d1080a
commit fb68d242bb
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
caputils/capture-pcap-util.c
View File

@ -39,14 +39,14 @@
#include <sys/socket.h>
#endif
#include <wtap.h>
#include <libpcap.h>
#include <wiretap/wtap.h>
#include <wiretap/libpcap.h>
#include "caputils/capture_ifinfo.h"
#include "caputils/capture-pcap-util.h"
#include "caputils/capture-pcap-util-int.h"
#include "wsutil/file_util.h"
#include <wsutil/file_util.h>
#ifndef _WIN32
#include <netinet/in.h>

8
caputils/capture_win_ifnames.c
View File

@ -31,10 +31,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <wtap.h>
#include <libpcap.h>
#include <glib.h>
#include <wiretap/wtap.h>
#include <wiretap/libpcap.h>
#include <ntddndis.h>
#ifndef NDIS_IF_MAX_STRING_SIZE
@ -49,7 +50,8 @@
#include "caputils/capture_ifinfo.h"
#include "caputils/capture_win_ifnames.h"
#include "wsutil/file_util.h"
#include <wsutil/file_util.h>
static int gethexdigit(const char *p)
{