#include "sysdep.h"
#include <limits.h>
#include "sysconfig.h"
+#include "typesize.h"
#include "ipcdef.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* Text description of this software
*/
-#define CITADEL "Citadel/UX 5.91"
+#define CITADEL "Citadel/UX 6.01"
/*
* REV_LEVEL is the current version number (multiplied by 100 to avoid having
* are older than REV_MIN, none of the programs will work until the setup
* program is run again to bring things up to date.
*/
-#define REV_LEVEL 591 /* This version */
+#define REV_LEVEL 601 /* This version */
#define REV_MIN 591 /* Oldest compatible version */
#define SERVER_TYPE 0 /* zero for stock Citadel/UX; other developers please
#define tolower(x) ( ((x>='A')&&(x<='Z')) ? (x+'a'-'A') : x )
#define NEW_CONFIG
-/*
- * The only typedef we do is an 8-bit unsigned, for screen dimensions.
- * All other defs are done using standard C types. The code assumes that
- * 'int' 'unsigned' and 'short' are at least 16 bits, and that 'long' is at
- * least 32 bits. There are no endian dependencies in any of the Citadel
- * programs.
- */
-typedef unsigned char CIT_UBYTE;
-
/* Various length constants */
#define UGLISTLEN 100 /* you get a ungoto list of this size */
* in the nonce, as per the APOP RFC.
*/
-#define USERNAME_SIZE 32 /* The size of a username string */
+#define USERNAME_SIZE 64 /* The size of a username string */
/*
* Message expiration policy stuff
struct march {
struct march *next;
char march_name[ROOMNAMELEN];
+ unsigned int march_flags;
char march_floor;
char march_order;
};
unsigned flags; /* See US_ flags below */
long timescalled; /* Total number of logins */
long posted; /* Number of messages posted (ever) */
- CIT_UBYTE axlevel; /* Access level */
+ cit_uint8_t axlevel; /* Access level */
long usernum; /* User number (never recycled) */
time_t lastcall; /* Last time the user called */
int USuserpurge; /* Purge time (in days) for user */
char fullname[64]; /* Name for Citadel messages & mail */
- CIT_UBYTE USscreenwidth; /* Screen width (for textmode users)*/
- CIT_UBYTE USscreenheight; /* Screen height(for textmode users)*/
+ cit_uint8_t USscreenwidth; /* Screen width (for textmode users)*/
+ cit_uint8_t USscreenheight; /* Screen height(for textmode users)*/
};
#define VIEW_MAILBOX 1 /* Mailbox summary */
#define VIEW_ADDRESSBOOK 2 /* Address book view */
+#ifdef __cplusplus
+}
+#endif
+
+#ifdef tmpnam
+#undef tmpnam
+#endif
+#define tmpnam(x) CtdlTempFileName(__FILE__, __LINE__)
+
+#ifdef tmpfile
+#undef tmpfile
+#endif
+#define tmpfile() CtdlTempFile()
+
#endif /* CITADEL_H */