diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-31 13:51:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-31 13:51:15 -0400 |
| commit | 904a58d10f144b95a689b35c88f6780371243da8 (patch) | |
| tree | 174369db1cb98f3011124c306f3b06ae2b78b10d /src/common/util.h | |
| parent | d5a5a6a2534e114b6c89c7ddb7840ab3040657b8 (diff) | |
| parent | 8a0eedbbb08199818cd7c2c6998f062c03e33122 (diff) | |
| download | tor-904a58d10f144b95a689b35c88f6780371243da8.tar.gz tor-904a58d10f144b95a689b35c88f6780371243da8.zip | |
Merge branch 'bug9288_rebased'
Conflicts:
src/test/test_pt.c
Diffstat (limited to 'src/common/util.h')
| -rw-r--r-- | src/common/util.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/common/util.h b/src/common/util.h index 0a8e4a23fc..dd7a169a1b 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -492,18 +492,21 @@ FILE *tor_process_get_stdout_pipe(process_handle_t *process_handle); #endif #ifdef _WIN32 -struct smartlist_t * -tor_get_lines_from_handle(HANDLE *handle, - enum stream_status *stream_status); +MOCK_DECL(struct smartlist_t *, +tor_get_lines_from_handle,(HANDLE *handle, + enum stream_status *stream_status)); #else -struct smartlist_t * -tor_get_lines_from_handle(FILE *handle, - enum stream_status *stream_status); +MOCK_DECL(struct smartlist_t *, +tor_get_lines_from_handle,(FILE *handle, + enum stream_status *stream_status)); #endif -int tor_terminate_process(process_handle_t *process_handle); -void tor_process_handle_destroy(process_handle_t *process_handle, - int also_terminate_process); +int +tor_terminate_process(process_handle_t *process_handle); + +MOCK_DECL(void, +tor_process_handle_destroy,(process_handle_t *process_handle, + int also_terminate_process)); /* ===== Insecure rng */ typedef struct tor_weak_rng_t { |