Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / citadel_decls.h

diff --git a/citadel/citadel_decls.h b/citadel/citadel_decls.h
index 0daa6c2f37e1161111bb141650c1c2bdb752b3d5..19895e6261070787a25835aa93cb49db3b37e75f 100644 (file)
--- a/citadel/citadel_decls.h
+++ b/citadel/citadel_decls.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 extern char fullname[USERNAME_SIZE];
 extern unsigned room_flags;
 extern char room_name[ROOMNAMELEN];
@@ -24,11 +23,10 @@ extern char rc_screen;
 extern char arg_screen;
 #endif
 extern char rc_alt_semantics;
-extern char rc_reply_extedit;
 extern char instant_msgs;
-void logoff(CtdlIPC *ipc, int code);
+void ctdl_logoff(char *file, int line, CtdlIPC *ipc, int code);
+#define logoff(ipc, code)      ctdl_logoff(__FILE__, __LINE__, (ipc), (code))
 void formout(CtdlIPC *ipc, char *name);
 void sighandler(int which_sig);
 extern int secure;
-extern int can_do_msg4;
 void remove_march(char *roomname, int floornum);