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

We need epan/wmem/wmem.h regardless of whether we have GeoIP. 

It's used to generate the "sorry, we don't have GeoIP" message.

Change-Id: Ibd4e15508d3e2d09d81951b4dc23a1264971bb7a
Reviewed-on: https://code.wireshark.org/review/6610
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2015-01-18 02:46:49 -08:00
parent c7500dd46a
commit ebea11a1f4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
epan/geoip_db.c
View File

@ -31,14 +31,16 @@
#include <glib.h>
#include <epan/wmem/wmem.h>
#ifdef HAVE_GEOIP
#include <GeoIP.h>
#include <GeoIPCity.h>
#include "geoip_db.h"
#include "uat.h"
#include "prefs.h"
#include "value_string.h"
#include <epan/geoip_db.h>
#include <epan/uat.h>
#include <epan/prefs.h>
#include <epan/value_string.h>
#include <wsutil/report_err.h>
#include <wsutil/file_util.h>