diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-04-14 16:52:10 +0200 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-14 17:53:09 +0000 |
| commit | 74784bdb3ef60d02f6041f6ec6c3b56e3841a2db (patch) | |
| tree | 472099c4dd8c42c3677e94442bcce2b7abc89f31 /cmakeconfig.h.in | |
| parent | 90afc2582b4cd5a8ae75dcb9f6e19330a28aa5f9 (diff) | |
| download | wireshark-74784bdb3ef60d02f6041f6ec6c3b56e3841a2db.tar.gz | |
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>
Diffstat (limited to 'cmakeconfig.h.in')
| -rw-r--r-- | cmakeconfig.h.in | 3 |
1 files changed, 3 insertions, 0 deletions
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 |