Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'phoenix' of github.com:InvictusInnovations/fc into phoenix

Browse source
This commit is contained in:
Daniel Larimer 2013-08-14 01:11:54 -04:00
commit a080830c54
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -31,8 +31,8 @@ ZERO_CHECK
*.lastbuildstate *.lastbuildstate
*.sdf *.sdf
*.opensdf *.opensdf
Debug Debug/
Release Release/
CMakeFiles CMakeFiles
Makefile Makefile

3
src/uint128.cpp
View file

@ -3,8 +3,9 @@
#include <fc/crypto/bigint.hpp> #include <fc/crypto/bigint.hpp>
#ifdef WIN32 #ifdef WIN32
#include <WinSock2.h> #include <WinSock2.h>
#endif #else
#include <arpa/inet.h> #include <arpa/inet.h>
#endif
namespace fc namespace fc
{ {