Version number to 7.35 in preparation for an upcoming release.

[citadel.git] / citadel / citadel.h

diff --git a/citadel/citadel.h b/citadel/citadel.h
index f646fae3c2e652e2f0358a5880f8fffe95db65b2..c68393b17e6be059fe378982e820f5e78f975015 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -11,15 +11,6 @@
 #define CITADEL_H
 /* #include <dmalloc.h> uncomment if using dmalloc */
 
-/* Build Citadel with the calendar service only if the header *and*
- * library for libical are both present.
- */
-#ifdef HAVE_LIBICAL
-#ifdef HAVE_ICAL_H
-#define CITADEL_WITH_CALENDAR_SERVICE 1
-#endif
-#endif
-
 #include "sysdep.h"
 #include <limits.h>
 #include "sysconfig.h"
@@ -47,14 +38,20 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      725             /* This version */
+#define REV_LEVEL      735             /* This version */
 #define REV_MIN                591             /* Oldest compatible database */
-#define EXPORT_REV_MIN 725             /* Oldest compatible export files */
-#define LIBCITADEL_MIN 103             /* Minimum required version of libcitadel */
+#define EXPORT_REV_MIN 733             /* Oldest compatible export files */
+#define LIBCITADEL_MIN 109             /* Minimum required version of libcitadel */
 
 #define SERVER_TYPE 0                  /* zero for stock Citadel; other developers please
                                           obtain SERVER_TYPE codes for your implementations */
 
+#ifdef LIBCITADEL_VERSION_NUMBER
+#if LIBCITADEL_VERSION_NUMBER < LIBCITADEL_MIN
+#error libcitadel is too old.  Please upgrade it before continuing.
+#endif
+#endif
+
 /* Various length constants */
 
 #define UGLISTLEN      100     /* you get a ungoto list of this size */
@@ -71,6 +68,7 @@ extern "C" {
 /*
  * Message expiration policy stuff
  */
+typedef struct ExpirePolicy ExpirePolicy;
 struct ExpirePolicy {
 /*
 #include "datadefinitions.h"
@@ -92,6 +90,7 @@ struct ExpirePolicy {
  * fetches from the server.  This allows the client to "march" through
  * relevant rooms without having to ask the server each time where to go next.
  */
+typedef struct march march;
 struct march {
 /*
 #include "datadefinitions.h"
@@ -121,6 +120,7 @@ struct march {
 /*
  * User records.
  */
+typedef struct ctdluser ctdluser;
 struct ctdluser {                      /* User record                      */
 /*
 #include "datadefinitions.h"
@@ -152,6 +152,7 @@ struct ctdluser {                   /* User record                      */
 /*
  * Room records.
  */
+typedef struct ctdlroom ctdlroom;
 struct ctdlroom {
 /*
 #include "datadefinitions.h"
@@ -198,6 +199,7 @@ struct ctdlroom {
 /*
  * Floor record.  The floor number is implicit in its location in the file.
  */
+typedef struct floor floor;
 struct floor {
 /*
 #include "datadefinitions.h"
@@ -265,7 +267,7 @@ enum {
 #define FILTERLIST     "application/x-citadel-filter-list"
 #define SIEVECONFIG    "application/x-citadel-sieve-config"
 
-#define TRACE  lprintf(CTDL_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
+#define TRACE  CtdlLogPrintf(CTDL_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
 
 #ifndef LONG_MAX
 #define LONG_MAX 2147483647L
@@ -276,6 +278,7 @@ enum {
  */
 #define AUTHMODE_NATIVE                0       /* native Citadel authentication */
 #define AUTHMODE_HOST          1       /* host integrated */
+#define AUTHMODE_LDAP          2       /* external LDAP authentication */
 
 #ifdef __cplusplus
 }