Fix the build problems revolving around CitContext and context.h

Must have missed a make clean before I comitted.

Header file ordering and dependancies are a nightmare in modules. Sooner
I get that cleaned up to only need ctdl_module.h the better.

diff --git a/citadel/include/ctdl_module.h b/citadel/include/ctdl_module.h
index 71fa155340686ef1876aabcbf5f01f78f2edfa77..3300596fca9d8f7caf04e48fd0b587f95b594be8 100644 (file)
--- a/citadel/include/ctdl_module.h
+++ b/citadel/include/ctdl_module.h
@@ -45,6 +45,8 @@
 #include "msgbase.h"
 #include "threads.h"
 #include "citadel_dirs.h"
+#include "context.h"
+
 /*
  * define macros for module init stuff
  */

diff --git a/citadel/modules/chat/serv_chat.c b/citadel/modules/chat/serv_chat.c
index 6b479b06aeb3a3ba2a875ccab3665314a4200238..66dcf55773b99e270fd899dee1dbd054b11644fd 100644 (file)
--- a/citadel/modules/chat/serv_chat.c
+++ b/citadel/modules/chat/serv_chat.c
@@ -230,9 +230,9 @@ void allwrite(char *cmdbuf, int flag, char *username)
 }
 
 
-t_context *find_context(char **unstr)
+CitContext *find_context(char **unstr)
 {
-       t_context *t_cc, *found_cc = NULL;
+       CitContext *t_cc, *found_cc = NULL;
        char *name, *tptr;
 
        if ((!*unstr) || (!unstr))

diff --git a/citadel/modules/chat/serv_chat.h b/citadel/modules/chat/serv_chat.h
index 9ea923547727d3b36da78e53e57e3fa16e3975a5..6ceba2682488fd371913878180ae21aedc7888ae 100644 (file)
--- a/citadel/modules/chat/serv_chat.h
+++ b/citadel/modules/chat/serv_chat.h
@@ -1,7 +1,9 @@
 /* $Id$ */
+#include "ctdl_module.h"
+
 void ChatUnloadingTest(void);
 void allwrite (char *cmdbuf, int flag, char *username);
-t_context *find_context (char **unstr);
+CitContext *find_context (char **unstr);
 void do_chat_listing (int allflag);
 void cmd_chat (char *argbuf);
 void cmd_pexp (char *argbuf); /* arg unused */

diff --git a/citadel/modules/migrate/serv_migrate.c b/citadel/modules/migrate/serv_migrate.c
index cf3395d509e7331bd5347fe722ae2b8bb00e73bb..0e85bbc42f3f20b6c490ffbedd58971c18d45813 100644 (file)
--- a/citadel/modules/migrate/serv_migrate.c
+++ b/citadel/modules/migrate/serv_migrate.c
@@ -339,7 +339,7 @@ void migr_export_messages(void) {
        char buf[SIZ];
        long msgnum;
        int count = 0;
-       t_context *Ctx;
+       CitContext *Ctx;
 
        Ctx = CC;
        migr_global_message_list = fopen(migr_tempfilename1, "r");
@@ -368,7 +368,7 @@ void migr_export_messages(void) {
 void migr_do_export(void) {
        struct config *buf;
        buf = &config;
-       t_context *Ctx;
+       CitContext *Ctx;
 
        Ctx = CC;
        cprintf("%d Exporting all Citadel databases.\n", LISTING_FOLLOWS);

diff --git a/citadel/modules/newuser/serv_newuser.c b/citadel/modules/newuser/serv_newuser.c
index 08cf48d7e5fd47ae3d049d001070b08a933bd85d..06a029a856927a7b292cc44c0d37bbf947729f0a 100644 (file)
--- a/citadel/modules/newuser/serv_newuser.c
+++ b/citadel/modules/newuser/serv_newuser.c
@@ -51,6 +51,9 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
+
+#include "ctdl_module.h"
+
 #include "citadel.h"
 #include "server.h"
 #include "citserver.h"
@@ -62,11 +65,8 @@
 #include "msgbase.h"
 
 
-#include "ctdl_module.h"
-
 
 
-extern struct CitContext *ContextList;
 
 
 /*