From: Art Cancro <ajc@citadel.org>
Date: Mon, 16 May 2005 20:03:33 +0000 (+0000)
Subject: * definition of struct CitControl moved from citadel.h to server.h
X-Git-Tag: v7.86~4918
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=1d2c521685959a0483a3e342a8b72ced366cc047

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

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 68a9135d6..e860cbfb5 100644
--- 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 4fdbc12b1..62a1a5e6c 100644
--- 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 c6d6bb9bc..c42ac736b 100644
--- 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;