* definition of struct CitControl moved from citadel.h to server.h

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 68a9135d6c67b6d488bfe46cca9c93db564d8dd9..e860cbfb5ec3920428d7bf48dd4154d13929ef45 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 647.4  2005/05/16 20:03:33  ajc
+ * definition of struct CitControl moved from citadel.h to server.h
+
  Revision 647.3  2005/05/16 18:48:45  ajc
  * Don't prompt the user for screen dimensions anymore.  Nobody is using
    dialup terminals with arbitrary screen sizes anymore; nearly everyone (or
@@ -6696,4 +6699,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 4fdbc12b1a206dea255cc5ed86c1feb128968d7d..62a1a5e6c15eb8216088a4eec40e519a44ae3874 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -188,17 +188,6 @@ struct ctdluser {                  /* User record                      */
 };
 
 
-/*
- * This is the control record for the message base... 
- */
-struct CitControl {
-       long MMhighest;                 /* highest message number in file   */
-       unsigned MMflags;               /* Global system flags              */
-       long MMnextuser;                /* highest user number on system    */
-       long MMnextroom;                /* highest room number on system    */
-       int version;                    /* Server-hosted upgrade level      */
-};
-
 /* Bits which may appear in CitControl.MMflags.  Note that these don't
  * necessarily pertain to the message base -- it's just a good place to
  * store any global flags.

diff --git a/citadel/server.h b/citadel/server.h
index c6d6bb9bc13f5afbfe165e5958b5e0c44b7ca44e..c42ac736bb2c747c436b569b4eb906d7ecb5e9da 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -157,6 +157,17 @@ enum {
 struct CitContext *MyContext(void);
 #define CC MyContext()
 
+/*
+ * This is the control record for the message base... 
+ */
+struct CitControl {
+       long MMhighest;                 /* highest message number in file   */
+       unsigned MMflags;               /* Global system flags              */
+       long MMnextuser;                /* highest user number on system    */
+       long MMnextroom;                /* highest room number on system    */
+       int version;                    /* Server-hosted upgrade level      */
+};
+
 extern struct CitContext *ContextList;
 extern int ScheduledShutdown;
 extern struct CitControl CitControl;