diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-09-08 16:51:12 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-09-08 16:51:12 +0000 |
| commit | 2e8a61d3dcbe52e72e3342bf826d321699915ead (patch) | |
| tree | 725a7eda095f2457681932e7958b1c0f472f51cf /Makefile.nmake | |
| parent | 65729c9b09ad60f9097068f38e2a9a5e824890d6 (diff) | |
Attempt to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 :
Move libwsutil forward in the list of Wireshark libraries so that our inet_pton
is always used.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34081 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 3b328d78b6..c9b6c3fd58 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -72,9 +72,9 @@ dumpcap_OBJECTS = $(dumpcap_SOURCES:.c=.obj) randpkt_OBJECTS = $(randpkt_SOURCES:.c=.obj) wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ + wsutil\libwsutil.lib \ wsock32.lib user32.lib shell32.lib comctl32.lib \ $(HHC_LIBS) \ - wsutil\libwsutil.lib \ $(GNUTLS_LIBS) \ $(PYTHON_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK |