* more merges

[citadel.git] / citadel / sysdep_decls.h

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index 13d5c931fd240472b716ae1635f3ad9513f8d9fe..1398f30b05bc0f8b8aecaf15a37ac77ba4d39b88 100644 (file)
--- a/citadel/sysdep_decls.h
+++ b/citadel/sysdep_decls.h
@@ -19,8 +19,9 @@ void *sd_context_loop (struct CitContext *con);
 void start_daemon (int do_close_stdio);
 void cmd_nset (char *cmdbuf);
 int convert_login (char *NameToConvert);
-void worker_thread (void);
+void *worker_thread (void *arg);
 inline void become_session(struct CitContext *which_con);
 void CtdlRedirectOutput(FILE *fp, int sock);
 
 extern int num_sessions;
+extern int time_to_die;