Merge in fixes for SASL.

[m6w6/libmemcached] / libtest / killpid.h

diff --git a/libtest/killpid.h b/libtest/killpid.h
index 83c7bb0a94c87591a7e7dd584c81246d3ff86b24..becfd0ed8f0be7c460a7e31e9296c7ea835ea06b 100644 (file)
--- a/libtest/killpid.h
+++ b/libtest/killpid.h
@@ -27,4 +27,4 @@ bool kill_pid(pid_t pid_arg);
 
 pid_t kill_file(const std::string &filename);
 
-pid_t get_pid_from_file(const std::string &filename);
+pid_t get_pid_from_file(const std::string &filename, std::stringstream& error_message);