X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep_decls.h;h=221640fdd59e8c1fb961c9c8719944eff90f7146;hb=45fc293fa4f3071711a67c85b1337e5b1eebea23;hp=c2f95780459e9a7dec6c4d831d587420c39432ae;hpb=cb8cd32734a354007d10d75959ba990ac8baaa19;p=citadel.git

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index c2f957804..221640fdd 100644
--- 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,12 +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 *worker_thread (void *arg);
 void init_master_fdset(void);
-void create_worker(void);
-void *select_on_master (void *arg);
+void *worker_thread(void *);
 
 extern volatile int exit_signal;
 extern volatile int shutdown_and_halt;
@@ -76,45 +72,4 @@ extern int rescan[];
 
 extern int SyslogFacility(char *name);
 
-
-/*
- * Typdefs and stuff to abstract pthread for Citadel
- */
-#ifdef HAVE_PTHREAD_H
-
-typedef pthread_t	citthread_t;
-typedef pthread_key_t	citthread_key_t;
-typedef pthread_mutex_t	citthread_mutex_t;
-typedef pthread_cond_t	citthread_cond_t;
-typedef pthread_attr_t	citthread_attr_t;
-
-
-#define citthread_mutex_init	pthread_mutex_init
-#define citthread_cond_init	pthread_cond_init
-#define citthread_attr_init	pthread_attr_init
-#define citthread_mutex_trylock	pthread_mutex_trylock
-#define citthread_mutex_lock	pthread_mutex_lock
-#define citthread_mutex_unlock	pthread_mutex_unlock
-#define citthread_key_create	pthread_key_create
-#define citthread_getspecific	pthread_getspecific
-#define citthread_setspecific	pthread_setspecific
-#define citthread_mutex_destroy	pthread_mutex_destroy
-#define citthread_cond_destroy	pthread_cond_destroy
-#define citthread_attr_destroy	pthread_attr_destroy
-
-#define citthread_kill		pthread_kill
-#define citthread_cond_signal	pthread_cond_signal
-#define citthread_cancel	pthread_cancel
-#define citthread_cond_timedwait	pthread_cond_timedwait
-#define citthread_equal		pthread_equal
-#define citthread_self		pthread_self
-#define citthread_create	pthread_create
-#define citthread_attr_setstacksize	pthread_attr_setstacksize
-#define citthread_join		pthread_join
-#define citthread_cleanup_push	pthread_cleanup_push
-#define citthread_cleanup_pop	pthread_cleanup_pop
-
-
-#endif /* HAVE_PTHREAD_H */
-
 #endif /* SYSDEP_DECLS_H */