diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-11-15 19:58:39 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-11-15 20:39:37 +0000 |
| commit | 9b93e7e5b2fb898fff1815345ac0a63087a74758 (patch) | |
| tree | 43e3d06e8aa127b2ae5855412f7dff521bf142e3 | |
| parent | 8d9fbdf8515b89f4739a4bddb80d944d2a53b459 (diff) | |
Explain where GeoIP_free comes from
Change-Id: I0a354cde4587a041bdb1fa4147bd88eed24ceb76
Reviewed-on: https://code.wireshark.org/review/24356
Reviewed-by: João Valverde <j@v6e.pt>
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | cmakeconfig.h.in | 2 | ||||
| -rw-r--r-- | epan/geoip_db.c | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 70cec35044..66e4adc7f4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1163,7 +1163,7 @@ AC_DEFUN([AC_WIRESHARK_GEOIP_CHECK], ) AC_CHECK_LIB(GeoIP, GeoIP_free, [ - AC_DEFINE(HAVE_GEOIP_FREE, 1, [Define if GeoIP has GeoIP_free (not available upstream with 1.6.10 or earlier)]) + AC_DEFINE(HAVE_GEOIP_FREE, 1, [Define if GeoIP has GeoIP_free]) ],, ) fi diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index ec715cef29..aee8a4a494 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -68,7 +68,7 @@ /* 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) */ +/* Define if GeoIP has GeoIP_free */ #cmakedefine HAVE_GEOIP_FREE 1 /* Define to 1 if you have the <ifaddrs.h> header file. */ diff --git a/epan/geoip_db.c b/epan/geoip_db.c index 923a4fb2ae..164dec0496 100644 --- a/epan/geoip_db.c +++ b/epan/geoip_db.c @@ -48,6 +48,10 @@ /* This needs to match NUM_GEOIP_COLS in hostlist_table.h */ #define MAX_GEOIP_DBS 13 +/* + * GeoIP_free is patched into our GeoIP distribution on Windows. + * See bug 13598. + */ #ifndef HAVE_GEOIP_FREE #define GeoIP_free free #endif |