X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep_decls.h;h=781d2c02644f4d8fbf4352215672ad2e6004c6d8;hb=50ff39d933b7178377b3a67f8edc31ffa42ffd28;hp=a71efe59ac0d11aa277ab3a70e2c3869ee8e98de;hpb=d04e1208cf6c71816adb600c6493c48c7b9610f1;p=citadel.git

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index a71efe59a..781d2c026 100644
--- a/citadel/sysdep_decls.h
+++ b/citadel/sysdep_decls.h
@@ -11,15 +11,11 @@
 
 #ifdef HAVE_DB_H
 #include <db.h>
-#elif defined(HAVE_DB4_DB_H)
-#include <db4/db.h>
-#else
-#error Neither <db.h> nor <db4/db.h> was found by configure. Install db4-devel.
+#error <db.h> was not found by configure. Install the Berkeley DB development package.
 #endif
 
-
-#if DB_VERSION_MAJOR < 4 || DB_VERSION_MINOR < 1
-#error Citadel requires Berkeley DB v4.1 or newer.  Please upgrade.
+#if DB_VERSION_MAJOR < 5
+#error Citadel requires Berkeley DB v5 or newer.  Please upgrade.
 #endif
 
 #include "server.h"
@@ -31,6 +27,12 @@
 #define SIZE_T_FMT "%ld"
 #endif
 
+#if SIZEOF_LOFF_T == SIZEOF_LONG 
+#define LOFF_T_FMT "%ld"
+#else
+#define LOFF_T_FMT "%lld"
+#endif
+
 void cputbuf(const StrBuf *Buf);
 
 #ifdef __GNUC__
@@ -58,11 +60,9 @@ void sysdep_master_cleanup (void);
 void kill_session (int session_to_kill);
 void start_daemon (int do_close_stdio);
 void checkcrash(void);
-void cmd_nset (char *cmdbuf);
 int convert_login (char *NameToConvert);
 void init_master_fdset(void);
 void *worker_thread(void *);
-void *select_on_master(void *);
 
 extern volatile int exit_signal;
 extern volatile int shutdown_and_halt;