Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve failure to set up private chain #375

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Resolve failure to set up private chain #375

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c61d7dc
Update mmap.h
lijun4727 Feb 14, 2020
a40e46f
Update mmap_win32.c
lijun4727 Feb 14, 2020
3e95422
Update network.vcxproj
lijun4727 Feb 14, 2020
0e1989c
Update sendmore.cpp
lijun4727 Feb 17, 2020
e6edcc1
Update sendmore.hpp
lijun4727 Feb 17, 2020
f94feae
Update send.hpp
lijun4727 Feb 17, 2020
c113733
Update sendmore.hpp
lijun4727 Feb 17, 2020
7220fb8
Update sendmore.hpp
lijun4727 Feb 17, 2020
c5218e2
Merge remote-tracking branch 'remotes/origin/lijun4727-patch-1' into …
Mar 2, 2020
4fc4f8e
Merge remote-tracking branch 'remotes/origin/lijun4727-patch-2' into …
Mar 2, 2020
2366a9c
add package files
Mar 2, 2020
44c3f76
Merge remote-tracking branch 'remotes/origin/lijun4727-patch-1' into …
Mar 2, 2020
3ba831f
Merge branch 'temp_b' of https://github.com/mvs-org/metaverse into te…
Mar 2, 2020
30df01a
Merge branch 'temp_b' of https://github.com/mvs-org/metaverse into te…
Mar 2, 2020
bf3705a
update version
Mar 2, 2020
725eb7e
add command createmoremultisigtx
Mar 3, 2020
f79295a
Merge branch 'master' into temp_b
lijun4727 Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions builds/msvc-140/network/network.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<SubSystem>Windows</SubSystem>
</Link>
<Lib>
<AdditionalLibraryDirectories>..\..\..\..\miniupnp\miniupnpc\msvc\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\..\miniupnp\miniupnpc\msvc\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>miniupnpc.lib</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
Expand All @@ -144,11 +144,11 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
<Lib>
<AdditionalLibraryDirectories>..\..\..\..\miniupnp\miniupnpc\msvc\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\..\miniupnp\miniupnpc\msvc\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>miniupnpc.lib;</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion include/metaverse/consensus/libethash/mmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#define MAP_ANON MAP_ANONYMOUS
#define MAP_FAILED ((void *) -1)

void* mmap(void* start, size_t length, int prot, int flags, int fd, off_t offset);
void* mmap(void* start, size_t length, int prot, int flags, int fd, size_t offset);
void munmap(void* addr, size_t length);
#else // posix, yay! ^_^
#include <sys/mman.h>
Expand Down
2 changes: 1 addition & 1 deletion include/metaverse/consensus/libethash/mmap_win32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# define DWORD_LO(x) (x)
#endif

void* mmap(void* start, size_t length, int prot, int flags, int fd, off_t offset)
void* mmap(void* start, size_t length, int prot, int flags, int fd, size_t offset)
{
if (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC))
return MAP_FAILED;
Expand Down