Fix GeoIP-sans-IPv6 compilation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39281 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index f8da7fc1ad4f57fbca84ea2c56afb997eaef89b5..b19b164f90ad20b76a6d66247891e56506ae3254 100644 (file)
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -1864,7 +1864,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     }
   }
 
-#ifdef HAVE_GEOIP
+#ifdef HAVE_GEOIP_V6
   if (tree && ipv6_use_geoip) {
     add_geoip_info(ipv6_tree, tvb, offset, ipv6.ip6_src, ipv6.ip6_dst);
   }

diff --git a/epan/geoip_db.c b/epan/geoip_db.c
index 7374ca10aa72b45da646955ef5cbb9908a2966b7..06c8f3f5a916ea820c07cdabd366dfceb5688556 100644 (file)
--- a/epan/geoip_db.c
+++ b/epan/geoip_db.c
@@ -432,7 +432,7 @@ geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, char *not_found) {
 #else /* HAVE_GEOIP_V6 */
 
 const char *
-geoip_db_lookup_ipv6(guint dbnum _U_, struct e_in6_addr *addr _U_, char *not_found) {
+geoip_db_lookup_ipv6(guint dbnum _U_, struct e_in6_addr addr _U_, char *not_found) {
     return not_found;
 }