aboutsummaryrefslogtreecommitdiffstats
path: root/epan/geoip_db.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-01-18 02:46:49 -0800
committerGuy Harris <guy@alum.mit.edu>2015-01-18 10:49:02 +0000
commitebea11a1f46d6f88b00dcfbdb6abd54b25f71e0c (patch)
tree25c88fb0da85f47a3a71c5638c139241e5efa3fc /epan/geoip_db.c
parentc7500dd46ae24bd18cfd00e5b9426d4dad78db4d (diff)
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>
Diffstat (limited to 'epan/geoip_db.c')
-rw-r--r--epan/geoip_db.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/geoip_db.c b/epan/geoip_db.c
index 7ef82645ce..18bc7c076d 100644
--- a/epan/geoip_db.c
+++ b/epan/geoip_db.c
@@ -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>