Relocate regex.h test to near top and die if it fails.

[openldap] / servers / slurpd / globals.h

diff --git a/servers/slurpd/globals.h b/servers/slurpd/globals.h
index 1582d1780daae21c8a4d6410420ca03b28758424..955ce6467a9ed98ab03784838b846d91b7dc569e 100644 (file)
--- a/servers/slurpd/globals.h
+++ b/servers/slurpd/globals.h
@@ -23,13 +23,13 @@ LDAP_BEGIN_DECL
 
 typedef struct globals {
     /* Thread ID for file manager thread */
-    pthread_t fm_tid;
+    ldap_pvt_thread_t fm_tid;
     /* The name of the slapd config file (which is also our config file) */
     char *slapd_configfile;
     /* How long the master slurpd sleeps when there's no work to do */
     int        no_work_interval;
     /* We keep running until slurpd_shutdown is nonzero.  HUP signal set this */
-    int        slurpd_shutdown;
+    sig_atomic_t slurpd_shutdown;
     /* Number of replicas we're servicing */
     int num_replicas;
     /* Array of pointers to replica info */
@@ -49,7 +49,7 @@ typedef struct globals {
     /* Current offset into slurpd replica logfile */
     off_t srpos;
     /* mutex to serialize access to reject file */
-    pthread_mutex_t rej_mutex;
+    ldap_pvt_thread_mutex_t rej_mutex;
     /* pointer to status struct */
     St *st;
     /* Pointer to replication queue */
@@ -58,10 +58,6 @@ typedef struct globals {
     /* Default name of kerberos srvtab file */
     char *default_srvtab;
 #endif /* HAVE_KERBEROS */
-#if defined( HAVE_LWP )  && !defined( HAVE_LWP_THR )
-    tl_t *tsl_list;
-    mon_t tsl_mon;
-#endif /* THREAD_SUNOS4_LWP */
 } Globals;