Merge branch 'phoenix' of github.com:InvictusInnovations/fc into phoenix
This commit is contained in:
commit
a080830c54
2 changed files with 4 additions and 3 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -31,8 +31,8 @@ ZERO_CHECK
|
|||
*.lastbuildstate
|
||||
*.sdf
|
||||
*.opensdf
|
||||
Debug
|
||||
Release
|
||||
Debug/
|
||||
Release/
|
||||
|
||||
CMakeFiles
|
||||
Makefile
|
||||
|
|
|
|||
|
|
@ -3,8 +3,9 @@
|
|||
#include <fc/crypto/bigint.hpp>
|
||||
#ifdef WIN32
|
||||
#include <WinSock2.h>
|
||||
#endif
|
||||
#else
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
|
||||
namespace fc
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue