diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-28 21:52:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-28 21:52:32 +0200 |
| commit | 002a4dcad0c0f74b1063cf27f0a9550d5e56c3f0 (patch) | |
| tree | 58a16a226571a80537bfa7e3b1147aa4d0ee8767 /src/util.h | |
| parent | a8b95ce6ed5e84d34748ecdd0ff1db4d03377cf0 (diff) | |
| parent | 4dcad1d294e264a81280fd007d1508d9bd4f0273 (diff) | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Conflicts:
.gitignore (used upstream version)
bitcoin-qt.pro
Diffstat (limited to 'src/util.h')
| -rw-r--r-- | src/util.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/util.h b/src/util.h index 290195cbfa..97d638c93e 100644 --- a/src/util.h +++ b/src/util.h @@ -132,7 +132,7 @@ inline int myclosesocket(SOCKET& hSocket) return ret; } #define closesocket(s) myclosesocket(s) -#if !defined(QT_GUI) && !defined(GUI) +#if !defined(QT_GUI) inline const char* _(const char* psz) { return psz; @@ -197,6 +197,7 @@ void ShrinkDebugFile(); int GetRandInt(int nMax); uint64 GetRand(uint64 nMax); int64 GetTime(); +void SetMockTime(int64 nMockTimeIn); int64 GetAdjustedTime(); void AddTimeData(unsigned int ip, int64 nTime); std::string FormatFullVersion(); |