diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-22 21:41:24 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-22 21:41:24 +0200 |
| commit | 7beada58cd24b1e1121d038bbb61436ebc782770 (patch) | |
| tree | d3d2a5e14ec326e31ff2a42eccb0fd49e4befd4f /src | |
| parent | 8b936b617f2d51f66a86b407a51af55d8fb804fb (diff) | |
| parent | c2da35319d7d9c2a28a2299d09176a0459cf7e00 (diff) | |
| download | bitcoin-7beada58cd24b1e1121d038bbb61436ebc782770.tar.xz | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 1 | ||||
| -rw-r--r-- | src/makefile.vc | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 3a482e7cfa..54ef85e7c3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2574,6 +2574,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle) vGetData.clear(); } } + mapAlreadyAskedFor[inv] = nNow; pto->mapAskFor.erase(pto->mapAskFor.begin()); } if (!vGetData.empty()) diff --git a/src/makefile.vc b/src/makefile.vc index b25ba60c50..c050deb6ed 100644 --- a/src/makefile.vc +++ b/src/makefile.vc @@ -41,12 +41,12 @@ DEFS=$(DEFS) /DUSE_UPNP=$(USE_UPNP) !ENDIF LIBS=$(LIBS) \ - kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib ws2_32.lib shlwapi.lib + kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib ws2_32.lib shlwapi.lib iphlpapi.lib DEBUGFLAGS=/Os CFLAGS=/MD /c /nologo /EHsc /GR /Zm300 $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \ - script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h wallet.h keystore.h + script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h wallet.h keystore.h crypter.h OBJS= \ obj\util.obj \ @@ -58,7 +58,8 @@ OBJS= \ obj\main.obj \ obj\wallet.obj \ obj\rpc.obj \ - obj\init.obj + obj\init.obj \ + obj\crypter.obj CRYPTOPP_OBJS= \ cryptopp\obj\sha.obj \ @@ -93,6 +94,8 @@ obj\rpc.obj: $(HEADERS) obj\init.obj: $(HEADERS) +obj\crypter.obj: $(HEADERS) + obj\ui.obj: $(HEADERS) obj\uibase.obj: $(HEADERS) |