diff options
| author | Thomas Winget <tewinget@gmail.com> | 2015-01-21 11:25:48 -0500 |
|---|---|---|
| committer | Thomas Winget <tewinget@gmail.com> | 2015-01-21 11:26:53 -0500 |
| commit | 9d523780292b1bbf7208425a716e227730a9ba27 (patch) | |
| tree | 71216dcc7eb0945b4794b11c46d902d42a8e3d96 /src/cryptonote_config.h | |
| parent | Should fix std::min issues related to size_t (diff) | |
| parent | Merge pull request #215 (diff) | |
| download | monero-9d523780292b1bbf7208425a716e227730a9ba27.tar.xz | |
Merge to keep up with upstream
Merge 'monero-project/master' with blockchain
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 |