Added functionality for handling global profiles.

[obnox/wireshark/wip.git] / epan / addr_resolv.h

diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h
index 701ae81abc3fba1a14c88a794c5ec6ff376dc93c..79b424232a4bf8b82ab227a413f7c2d6406cfcf2 100644 (file)
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -47,7 +47,7 @@ extern "C" {
 /*
  * Flag controlling what names to resolve.
  */
-WS_VAR_IMPORT guint32 g_resolv_flags;
+WS_VAR_IMPORT guint32 gbl_resolv_flags;
 
 /* 32 types are sufficient (as are 640k of RAM) */
 /* FIXME: Maybe MANUF/m, IP/i, IP6/6, IPX/x, UDP+TCP/t etc would be
@@ -177,7 +177,7 @@ extern void add_ipv4_name(const guint addr, const gchar *name);
 extern void add_ipv6_name(const struct e_in6_addr *addr, const gchar *name);
 
 /* adds a hostname in the hash table */
-extern gboolean add_ip_name_from_string (const char *address, const char *name);
+extern gboolean add_ip_name_from_string (const char *addr, const char *name);
 
 /* add ethernet address / name corresponding to IP address  */
 extern void add_ether_byip(const guint ip, const guint8 *eth);