moved from citadel.h to server.h

diff --git a/citadel/Makefile b/citadel/Makefile
index afadac976edd29d0c624c0fa1de5de5e2e47c68b..bda087100041d2a16583d69f5f9613affdf2e067 100644 (file)
--- a/citadel/Makefile
+++ b/citadel/Makefile
@@ -18,6 +18,7 @@ citserver: server/*.c server/modules/*/*.c config.mk server/*.h
        cc ${CFLAGS} \
                server/*.c server/modules/*/*.c \
                ${LDFLAGS} -lresolv -lcitadel -lpthread -lz -lical -lldap -lcrypt -lexpat -lcurl -ldb \
+               -Wno-deprecated-declarations \
                -o citserver
 
 setup: utils/setup.c server/citadel_dirs.c utils/*.h server/*.h

diff --git a/citadel/server/citadel.h b/citadel/server/citadel.h
index 24b900ee674c7ec0f8da8afb85744316b8be63af..a05894a4c4519f205d82e61cd6e579a64f483abd 100644 (file)
--- a/citadel/server/citadel.h
+++ b/citadel/server/citadel.h
@@ -64,27 +64,6 @@ struct ExpirePolicy {
 #define EXPIRE_NUMMSGS         2       // Keep only latest n messages
 #define EXPIRE_AGE             3       // Expire messages after n days
 
-// User records.
-typedef struct ctdluser ctdluser;
-struct ctdluser {                      // User record
-       int version;                    // Citadel version which created this record
-       uid_t uid;                      // Associate with a unix account?
-       char password[32];              // password
-       unsigned flags;                 // See US_ flags below
-       long timescalled;               // Total number of logins
-       long posted;                    // Number of messages ever submitted
-       cit_uint8_t axlevel;            // Access level
-       long usernum;                   // User number (never recycled)
-       time_t lastcall;                // Date/time of most recent login
-       int USuserpurge;                // Purge time (in days) for user
-       char fullname[64];              // Display name (primary identifier)
-       long msgnum_bio;                // msgnum of user's profile (bio)
-       long msgnum_pic;                // msgnum of user's avatar (photo)
-       char emailaddrs[512];           // Internet email addresses
-       long msgnum_inboxrules;         // msgnum of user's inbox filtering rules
-       long lastproc_inboxrules;       // msgnum of last message filtered
-};
-
 // Bits which may appear in MMflags.
 #define MM_VALID       4               // New users need validating
 

diff --git a/citadel/server/server.h b/citadel/server/server.h
index 2e03dfe03117edd0d2bff56805542a2075d1cf0f..645568466e98ca0498bc83bee4e69a2ebd216e0e 100644 (file)
--- a/citadel/server/server.h
+++ b/citadel/server/server.h
@@ -296,4 +296,27 @@ typedef enum _MsgField {
        eVltMsgNum    = '3'
 } eMsgField;
 
+
+// User records.
+typedef struct ctdluser ctdluser;
+struct ctdluser {                      // User record
+       int version;                    // Citadel version which created this record
+       uid_t uid;                      // Associate with a unix account?
+       char password[32];              // password
+       unsigned flags;                 // See US_ flags below
+       long timescalled;               // Total number of logins
+       long posted;                    // Number of messages ever submitted
+       cit_uint8_t axlevel;            // Access level
+       long usernum;                   // User number (never recycled)
+       time_t lastcall;                // Date/time of most recent login
+       int USuserpurge;                // Purge time (in days) for user
+       char fullname[64];              // Display name (primary identifier)
+       long msgnum_bio;                // msgnum of user's profile (bio)
+       long msgnum_pic;                // msgnum of user's avatar (photo)
+       char emailaddrs[512];           // Internet email addresses
+       long msgnum_inboxrules;         // msgnum of user's inbox filtering rules
+       long lastproc_inboxrules;       // msgnum of last message filtered
+};
+
+
 #endif // SERVER_H