ctdl_tcp_server and ctdl_uds_server improved handling of error

[citadel.git] / citadel / sysdep_decls.h

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index a71efe59ac0d11aa277ab3a70e2c3869ee8e98de..221640fdd59e8c1fb961c9c8719944eff90f7146 100644 (file)
--- a/citadel/sysdep_decls.h
+++ b/citadel/sysdep_decls.h
@@ -9,17 +9,10 @@
 #include <pthread.h>
 #endif
 
-#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.
-#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 +24,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__
@@ -40,8 +39,8 @@ void cprintf (const char *format, ...);
 #endif
 
 void init_sysdep (void);
-int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errormessage);
-int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage);
+int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len);
+int ctdl_uds_server(char *sockpath, int queue_len);
 void buffer_output(void);
 void unbuffer_output(void);
 void flush_output(void);
@@ -58,11 +57,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;