Moved "struct visit" from citadel.h to server.h

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 4aa07fee31bddd351242adae0cc718d012e884a2..143da9528da10df2c34e960c3709770e14af2923 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,7 @@
+Sun Oct 11 02:51:55 EDT 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
+       * Moved "struct visit" and its associated defs from citadel.h to
+         server.h where they belong
+
 1998-10-10 Nathan Bryant <bryant@cs.usm.maine.edu>
        * citserver.c: fix overrun which caused segv's on servers with long
          hostnames.

diff --git a/citadel/citadel.h b/citadel/citadel.h
index d8fb2ad468393a1f9b1ebc329b7baa383f7e0c18..498cb46456717b6f9d0cafd7c561b2c4cdd27529 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -66,25 +66,6 @@ struct config {
 #define TWITROOM               config.c_twitroom
 #define RESTRICT_INTERNET      config.c_restrict
 
-
-/* Defines the relationship of a user to a particular room */
-struct visit {
-       char v_roomname[ROOMNAMELEN];
-       long v_generation;
-       long v_lastseen;
-       unsigned int v_flags;
-       };
-
-#define V_FORGET       1               /* User has zapped this room        */
-#define V_LOCKOUT      2               /* User is locked out of this room  */
-#define V_ACCESS       4               /* Access is granted to this room   */
-
-#define UA_INUSE                1
-#define UA_KNOWN                2
-#define UA_GOTOALLOWED          4
-#define UA_HASNEWMSGS           8
-#define UA_ZAPPED              16
-
 /* Defines the actual user record */
 struct usersupp {                      /* User record                      */
        int USuid;                      /* userid (==BBSUID for bbs only)   */

diff --git a/citadel/server.h b/citadel/server.h
index 98acc572923d364976fea15dc01b1c58aa66bb2c..57ad22ff22caf06881e35c24aeaaebeebf1520a0 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -180,3 +180,22 @@ extern struct UserFunctionHook *UserHookTable;
 
 #define EVT_PURGEUSER  100     /* Deleting a user */
 #define EVT_OUTPUTMSG  101     /* Outputting a message */
+
+
+/* Defines the relationship of a user to a particular room */
+struct visit {
+       char v_roomname[ROOMNAMELEN];
+       long v_generation;
+       long v_lastseen;
+       unsigned int v_flags;
+       };
+
+#define V_FORGET       1               /* User has zapped this room        */
+#define V_LOCKOUT      2               /* User is locked out of this room  */
+#define V_ACCESS       4               /* Access is granted to this room   */
+
+#define UA_INUSE                1
+#define UA_KNOWN                2
+#define UA_GOTOALLOWED          4
+#define UA_HASNEWMSGS           8
+#define UA_ZAPPED              16