From 74784bdb3ef60d02f6041f6ec6c3b56e3841a2db Mon Sep 17 00:00:00 2001
From: Pascal Quantin <pascal.quantin@gmail.com>
Date: Fri, 14 Apr 2017 16:52:10 +0200
Subject: Update Windows binaries to GeoIP 1.6.10 with a local GeoIP_free
 function

This solves a crash occurring when trying to free memory allocated by
GeoIP (cross-compiled with mingw(32|64)) with MSVC function

Bug: 13598
Change-Id: I757cff13660bd485d7ea91d10660e9bf86404728
Reviewed-on: https://code.wireshark.org/review/21090
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
---
 cmakeconfig.h.in | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'cmakeconfig.h.in')

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 5607a98390..5147c7f1be 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -67,6 +67,9 @@
 /* Define if GeoIP supports IPv6 (GeoIP 1.4.5 and later) */
 #cmakedefine HAVE_GEOIP_V6 1
 
+/* Define if GeoIP has GeoIP_free (not available upstream with 1.6.10 or earlier) */
+#cmakedefine HAVE_GEOIP_FREE 1
+
 /* Define to 1 if you have the <ifaddrs.h> header file. */
 #cmakedefine HAVE_IFADDRS_H 1
 
-- 
cgit v1.2.1