osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
João Valverde 2017-11-15 19:58:39 +00:00 committed by João Valverde
parent 8d9fbdf851
commit 9b93e7e5b2
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acinclude.m4
View File

@ -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

2
cmakeconfig.h.in
View File

@ -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. */

4
epan/geoip_db.c
View File

@ -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