Moved from citadel.h to server.h

diff --git a/citadel/server/citadel.h b/citadel/server/citadel.h
index b96435c9e4cf876efaa18080443a1e4e9866bde6..84e5b837ef278cf699b74a34a933add34616909d 100644 (file)
--- a/citadel/server/citadel.h
+++ b/citadel/server/citadel.h
@@ -72,16 +72,6 @@ struct ExpirePolicy {
 #define MES_ANONONLY   66              // "****" header
 #define MES_ANONOPT    67              // "Anonymous" header
 
-// Floor record.  The floor number is implicit in its location in the file.
-struct floor {
-       unsigned short f_flags;         // flags
-       char f_name[256];               // name of floor
-       int f_ref_count;                // reference count
-       struct ExpirePolicy f_ep;       // default expiration policy
-};
-
-#define F_INUSE                1               // floor is in use
-
 // Values used internally for function call returns, etc.
 #define NEWREGISTER    0               // new user to register
 #define REREGISTER     1               // existing user reregistering

diff --git a/citadel/server/server.h b/citadel/server/server.h
index 64797f80f3ab7aae1b23625e7eb67f04a1519560..12616070d67e0b4a390fd02a63e5a616a9b8c440 100644 (file)
--- a/citadel/server/server.h
+++ b/citadel/server/server.h
@@ -344,5 +344,15 @@ struct ctdlroom {
 // flagged with both QR_PRIVATE and QR_PASSWORDED while guess-name rooms are
 // flagged with both QR_PRIVATE and QR_GUESSNAME.  NEVER set all three flags.
 
+// Floor record.  The floor number is implicit in its location in the file.
+struct floor {
+       unsigned short f_flags;         // flags
+       char f_name[256];               // name of floor
+       int f_ref_count;                // reference count
+       struct ExpirePolicy f_ep;       // default expiration policy
+};
+
+#define F_INUSE                1               // floor is in use
+
 
 #endif // SERVER_H