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 8ca2bc19b601f752896720e63132e19e6f75ffd2..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"
@@ -46,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);