move stuff around

diff --git a/citadel/server/citadel_defs.h b/citadel/server/citadel_defs.h
index f19067f82bb8806a7b17b36a4b19ff2cea8a78d8..ab3e6121686b62bea620d508723fabbc61a6720d 100644 (file)
--- a/citadel/server/citadel_defs.h
+++ b/citadel/server/citadel_defs.h
@@ -1,4 +1,4 @@
-// Definitions for the Citadel Server
+// Preprocessor definitions for the Citadel Server
 //
 // Copyright (c) 1987-2023 by the citadel.org team
 //
@@ -6,8 +6,8 @@
 // is subject to the terms of the GNU General Public License, version 3.
 // The program is distributed without any warranty, expressed or implied.
 
-#ifndef CITADEL_H
-#define CITADEL_H
+#ifndef CITADEL_DEFS_H
+#define CITADEL_DEFS_H
 
 // Suppress these compiler warnings
 #pragma GCC diagnostic ignored "-Wcast-qual"
@@ -21,7 +21,6 @@
 #include "typesize.h"
 #include "ipcdef.h"
 
-
 #define REV_LEVEL 972          // This version
 #define REV_MIN                591             // Oldest compatible database
 #define EXPORT_REV_MIN 931             // Oldest compatible export files
@@ -47,7 +46,6 @@
 // Various length constants
 #define ROOMNAMELEN    128             // The size of a roomname string
 #define USERNAME_SIZE  64              // The size of a username string
-#define MAX_EDITORS    5               // number of external editors supported ; must be at least 1
 
 // Bits which may appear in MMflags.
 #define MM_VALID       4               // New users need validating
@@ -76,4 +74,11 @@
 #define AUTHMODE_LDAP          2       // Authenticate using LDAP server with POSIX schema
 #define AUTHMODE_LDAP_AD       3       // Authenticate using LDAP server with Active Directory schema
 
-#endif // CITADEL_H
+// Found in struct CtdlMessage
+#define        CTDLMESSAGE_MAGIC       0x159d
+#define        CM_SKIP_HOOKS           0x01    // Don't run server-side handlers
+
+// Floors
+#define F_INUSE                1               // floor is in use
+
+#endif // CITADEL_DEFS_H

diff --git a/citadel/server/server.h b/citadel/server/server.h
index 09054b182b4e443b3c1f348caf875be1d608fa19..1e9a0df131d7bb887cd3bde687f85ac69b8500dd 100644 (file)
--- a/citadel/server/server.h
+++ b/citadel/server/server.h
@@ -30,9 +30,6 @@ struct CtdlMessage {
        unsigned int cm_flags;          // How to handle (NOT SAVED TO DISK)
 };
 
-#define        CTDLMESSAGE_MAGIC       0x159d
-#define        CM_SKIP_HOOKS           0x01    // Don't run server-side handlers
-
 
 // Data structure returned by validate_recipients()
 struct recptypes {
@@ -364,7 +361,6 @@ struct floor {
        struct ExpirePolicy f_ep;       // default expiration policy
 };
 
-#define F_INUSE                1               // floor is in use
 
 
 #endif // SERVER_H