diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-06-14 11:46:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-06-14 11:46:38 -0400 |
| commit | a7cafb1ea9307864c94ad3e019af93d09d48350e (patch) | |
| tree | 1c6cc26fb0a93f46d839b3cb46855c93aca135f4 /src/common/compat.h | |
| parent | a58d94fb7c6c304ecba930eaa7ebbade1d0686ab (diff) | |
| parent | e07d328457b26babe89abdcc1d5a550ee8273462 (diff) | |
| download | tor-a7cafb1ea9307864c94ad3e019af93d09d48350e.tar.gz tor-a7cafb1ea9307864c94ad3e019af93d09d48350e.zip | |
Merge branch 'bug8746_v2_squashed'
Conflicts:
src/common/include.am
Diffstat (limited to 'src/common/compat.h')
| -rw-r--r-- | src/common/compat.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/common/compat.h b/src/common/compat.h index 683c4d0897..ec7d2415ed 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -749,6 +749,10 @@ char *format_win32_error(DWORD err); #endif +#ifdef TOR_UNIT_TESTS +void tor_sleep_msec(int msec); +#endif + #ifdef COMPAT_PRIVATE #if !defined(HAVE_SOCKETPAIR) || defined(_WIN32) || defined(TOR_UNIT_TESTS) #define NEED_ERSATZ_SOCKETPAIR |