Release version 998 generated by do-release.sh

[citadel.git] / citadel / server / citadel_defs.h

diff --git a/citadel/server/citadel_defs.h b/citadel/server/citadel_defs.h
index b3414e70cc21933756d4761dea6f12119192d8dd..27c62501605e44f88c0e9184234bccb5f3fc4e27 100644 (file)
--- a/citadel/server/citadel_defs.h
+++ b/citadel/server/citadel_defs.h
@@ -11,8 +11,8 @@
 
 // Suppress these compiler warnings
 #pragma GCC diagnostic ignored "-Wcast-qual"
-#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
-#pragma GCC diagnostic ignored "-Wformat-truncation"
+#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"                // this doesn't work on FreeBSD
+#pragma GCC diagnostic ignored "-Wformat-truncation"           // nor does this
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
 #include "sysdep.h"
@@ -21,19 +21,19 @@
 #include "typesize.h"
 #include "ipcdef.h"
 
-#define REV_LEVEL 972          // This version
+#define REV_LEVEL 998          // This version
 #define REV_MIN                591     // Oldest compatible database
 #define EXPORT_REV_MIN 931     // Oldest compatible export files
 #define LIBCITADEL_MIN 951     // Minimum required version of libcitadel
 #define SERVER_TYPE    0       // zero for stock Citadel; other developers please obtain SERVER_TYPE codes for your implementations
 
-#define TRACE  syslog(LOG_DEBUG, "\033[7m  Checkpoint: %s : %d  \033[0m", __FILE__, __LINE__)
+#define TRACE  syslog(LOG_DEBUG, "\033[7m  Checkpoint: %p : %s : %d  \033[0m", CC, __FILE__, __LINE__)
 
 #ifndef LONG_MAX
 #define LONG_MAX 2147483647L
 #endif
 
-// hats off to https://stackoverflow.com/questions/5459868/concatenate-int-to-string-using-c-preprocessor
+// hat tip to https://stackoverflow.com/questions/5459868/concatenate-int-to-string-using-c-preprocessor
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)
 #define CITADEL        "Citadel Server " STR(REV_LEVEL)
@@ -87,7 +87,7 @@
 #define EXPIRE_NUMMSGS         2       // Keep only latest n messages
 #define EXPIRE_AGE             3       // Expire messages after n days
 
-#define RECPTYPES_MAGIC 0xfeeb
+#define RECPTYPES_MAGIC                0xfeeb
 
 #define CTDLEXIT_SHUTDOWN      0       // Normal shutdown; do NOT auto-restart
 
@@ -170,6 +170,7 @@ enum {
        S_IM_LOGS,
        S_OPENSSL,
        S_SMTPQUEUE,
+       S_INDEXER,
        MAX_SEMAPHORES
 };
 
@@ -204,7 +205,7 @@ enum {
        CDB_FULLTEXT,           // full text search index
        CDB_EUIDINDEX,          // locate msgs by EUID
        CDB_USERSBYNUMBER,      // index of users by number
-       CDB_EXTAUTH,            // associates OpenIDs with users
+       CDB_UNUSED1,            // this used to be the EXTAUTH table but is no longer used
        CDB_CONFIG,             // system configuration database
        MAXCDB                  // total number of CDB's defined
 };
@@ -260,7 +261,7 @@ typedef enum _MsgField {
        eJournal      = 'J',
        eReplyTo      = 'K',
        eListID       = 'L',
-       eMesageText   = 'M',
+       eMessageText   = 'M',
        eOriginalRoom = 'O',
        eMessagePath  = 'P',
        eRecipient    = 'R',