Switched back to the old style thread architecture in preparation for eventual migrat...

[citadel.git] / citadel / sysdep_decls.h

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index c2f95780459e9a7dec6c4d831d587420c39432ae..a71efe59ac0d11aa277ab3a70e2c3869ee8e98de 100644 (file)
--- a/citadel/sysdep_decls.h
+++ b/citadel/sysdep_decls.h
@@ -60,10 +60,9 @@ 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 *);
+void *select_on_master(void *);
 
 extern volatile int exit_signal;
 extern volatile int shutdown_and_halt;
@@ -76,45 +75,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 */