* more merges

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index 1e44a2e439505b2159052e4efba19b5cf3e6c78e..bfb95ccba49bfb391d78ba3f48efa87786df422e 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -87,10 +87,10 @@ struct CitContext {
 
        FILE *download_fp;      /* Fields relating to file transfer */
        FILE *upload_fp;
-       char upl_file[256];
-       char upl_path[256];
-       char upl_comment[256];
-       char upl_filedir[256];
+       char upl_file[SIZ];
+       char upl_path[SIZ];
+       char upl_comment[SIZ];
+       char upl_filedir[SIZ];
        char dl_is_net;
        char upload_type;
 
@@ -150,7 +150,7 @@ struct ChatLine {
        struct ChatLine *next;
        int chat_seq;
        time_t chat_time;
-       char chat_text[256];
+       char chat_text[SIZ];
        char chat_username[USERNAME_SIZE];
        char chat_room[ROOMNAMELEN];
 };
@@ -174,6 +174,7 @@ enum {
        S_SUPPMSGMAIN,
        S_I_WANNA_SELECT,
        S_CONFIG,
+       S_WORKER_LIST,
        MAX_SEMAPHORES
 };