diff options
author | Riccardo Spagni <ric@spagni.net> | 2015-01-08 12:17:08 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2015-01-08 12:18:00 +0200 |
commit | 24ddfa792ef0ab7062ce373351eaa4846b0737f4 (patch) | |
tree | eba682c85ba439d985556c2f178f49619eda894c /src/cryptonote_config.h | |
parent | Merge pull request #211 (diff) | |
parent | std::atomic_flag has no copy/move constructor, can't have a vector (diff) | |
download | monero-24ddfa792ef0ab7062ce373351eaa4846b0737f4.tar.xz |
Merge pull request #206
1b46226 std::atomic_flag has no copy/move constructor, can't have a vector (Thomas Winget)
df53c0a small typo in previous commit (Thomas Winget)
4a53898 DNS seed timeout and fallback (Thomas Winget)
Diffstat (limited to 'src/cryptonote_config.h')
-rw-r--r-- | src/cryptonote_config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h index 236bef388..e26945086 100644 --- a/src/cryptonote_config.h +++ b/src/cryptonote_config.h @@ -33,6 +33,8 @@ #include <string> #include <boost/uuid/uuid.hpp> +#define CRYPTONOTE_DNS_TIMEOUT_MS 20000 + #define CRYPTONOTE_MAX_BLOCK_NUMBER 500000000 #define CRYPTONOTE_MAX_BLOCK_SIZE 500000000 // block header blob limit, never used! #define CRYPTONOTE_GETBLOCKTEMPLATE_MAX_BLOCK_SIZE 196608 //size of block (bytes) that is the maximum that miners will produce |