Merge the "resolv" rename changes with the trunk.

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

diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 128e211f715d32a2b5a7ec7dc1860e91d8942b1f..d8fb3a45e87af23b32bae45fbdaab8b6f7a1908c 100644 (file)
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -34,6 +34,7 @@ DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
        $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
 
 OBJECTS=addr_and_mask.obj \
+       addr_resolv.obj   \
        atalk-utils.obj \
        bitswap.obj     \
        circuit.obj     \
@@ -52,7 +53,6 @@ OBJECTS=addr_and_mask.obj \
        packet.obj       \
        plugins.obj      \
        proto.obj        \
-       resolv.obj       \
        sna-utils.obj   \
        strutil.obj      \
        timestamp.obj \

diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 990820535c8a02513e3253c56b61ee01f2142e0c..88daa9c42c4ef1e0045224866e216433bf55cbed 100644 (file)
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -1,4 +1,4 @@
-/* resolv.c
+/* addr_resolv.c
  * Routines for network object lookup
  *
  * $Id$

diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h
index 65ad162a3b0a9ef06f261200dc9f99213ff7bd1c..0a64958ea4477e6f3c20a41767ce469567c27b04 100644 (file)
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -1,4 +1,4 @@
-/* resolv.h
+/* addr_resolv.h
  * Definitions for network object lookup
  *
  * $Id$