* room_ops.c: increased the thread safety of cgetfloor()

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index e8cebf98d80f921339f2607abac63f380fb18112..8c42ec21c95eb35fd08ac4710fde0fef9f53feb2 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -10,7 +10,7 @@
 #define SERVER_H
 
 #ifdef __GNUC__
-#define INLINE inline
+#define INLINE __inline__
 #else
 #define INLINE
 #endif
@@ -130,6 +130,10 @@ struct CitContext {
        int redirect_ssl;
 #endif
 
+       int buffering;
+       char *output_buffer;    /* hold output for one big dump */
+       int buffer_len;
+
        /* A linked list of all express messages sent to us. */
        struct ExpressMessage *FirstExpressMessage;
        int disable_exp;        /* Set to 1 to disable incoming pages */
@@ -210,6 +214,8 @@ enum {
        S_DIRECTORY,
        S_NETCONFIGS,
        S_PUBLIC_CLIENTS,
+       S_LDAP,
+       S_FLOORCACHE,
        MAX_SEMAPHORES
 };
 
@@ -316,13 +322,13 @@ extern struct SessionFunctionHook *SessionHookTable;
  */
 struct UserFunctionHook {
        struct UserFunctionHook *next;
-       void (*h_function_pointer) (char *username, long usernum);
+       void (*h_function_pointer) (struct ctdluser *usbuf);
        int eventtype;
 };
 extern struct UserFunctionHook *UserHookTable;
 
 #define EVT_PURGEUSER  100     /* Deleting a user */
-#define EVT_OUTPUTMSG  101     /* Outputting a message */
+#define EVT_NEWUSER    102     /* Creating a user */
 
 /*
  * MessageFunctionHook extensions are used for hooks which implement handlers
@@ -411,6 +417,7 @@ struct visit {
        long v_lastseen;
        unsigned int v_flags;
        char v_seen[SIZ];
+       char v_answered[SIZ];
        int v_view;
 };