diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-07-02 17:20:27 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-07-02 17:20:27 +0000 |
| commit | 72a20c1695d963755190c2975ecdab05ad67c0f3 (patch) | |
| tree | f0d1a8503bfebe75fcb95ebbfc905154f58b21de /Makefile.nmake | |
| parent | 9952ce524f3b196be80b175f6784438e856f7980 (diff) | |
| download | wireshark-72a20c1695d963755190c2975ecdab05ad67c0f3.tar.gz | |
Pull mkstemp() into tempfile.c. That's the only place we use it now, and
it's arguably the only place we _should_ use it. Add create_tempdir() to
tempfile.c and use it to create a temp directory for IP maps. This
should fix bug 3530.
(This still doesn't work on IE 8 / Vista here. IE gives an access denied
error in OpenLayers.js, but this is a separate issue).
svn path=/trunk/; revision=28920
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 958a961091..ccfc26ad0a 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -76,7 +76,6 @@ EXTRA_OBJECTS = \ getopt.obj \ inet_ntop.obj \ inet_pton.obj \ - mkstemp.obj \ strptime.obj wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ @@ -329,10 +328,10 @@ randpkt.exe : $(randpkt_OBJECTS) getopt.obj mt.exe -nologo -manifest "randpkt.exe.manifest" -outputresource:randpkt.exe;1 !ENDIF -dumpcap.exe : $(LIBS_CHECK) config.h svnversion.h $(dumpcap_OBJECTS) getopt.obj inet_ntop.obj mkstemp.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\dumpcap.res +dumpcap.exe : $(LIBS_CHECK) config.h svnversion.h $(dumpcap_OBJECTS) getopt.obj inet_ntop.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\dumpcap.res @echo Linking $@ $(LINK) @<< - /OUT:dumpcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dumpcap_LIBS) $(dumpcap_OBJECTS) getopt.obj inet_ntop.obj mkstemp.obj image\dumpcap.res + /OUT:dumpcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dumpcap_LIBS) $(dumpcap_OBJECTS) getopt.obj inet_ntop.obj image\dumpcap.res << !IF $(MSC_VER_REQUIRED) >= 1400 mt.exe -nologo -manifest "dumpcap.exe.manifest" -outputresource:dumpcap.exe;1 |