diff -ur jabberd-2.0s5.orig/c2s/c2s.h jabberd-2.0s5/c2s/c2s.h
--- jabberd-2.0s5.orig/c2s/c2s.h	Sat Nov 13 16:58:15 2004
+++ c2s/c2s.h	Sun Dec  5 14:44:00 2004
@@ -207,7 +207,7 @@
     xht                 sm_avail;
 };
 
-extern int      c2s_lost_router;
+extern sig_atomic_t c2s_lost_router;
 
 int             c2s_router_mio_callback(mio_t m, mio_action_t a, int fd, void *data, void *arg);
 int             c2s_router_sx_callback(sx_t s, sx_event_t e, void *data, void *arg);
diff -ur jabberd-2.0s5.orig/s2s/s2s.h jabberd-2.0s5/s2s/s2s.h
--- jabberd-2.0s5.orig/s2s/s2s.h	Sat Nov 13 17:29:29 2004
+++ s2s/s2s.h	Sun Dec  5 14:59:32 2004
@@ -195,7 +195,7 @@
     int                 pending;
 };
 
-extern int      s2s_lost_router;
+extern sig_atomic_t s2s_lost_router;
 
 int             s2s_router_mio_callback(mio_t m, mio_action_t a, int fd, void *data, void *arg);
 int             s2s_router_sx_callback(sx_t s, sx_event_t e, void *data, void *arg);
diff -ur jabberd-2.0s5.orig/sm/object.c jabberd-2.0s5/sm/object.c
--- jabberd-2.0s5.orig/sm/object.c	Sat Nov 13 17:08:33 2004
+++ sm/object.c	Sun Dec  5 15:03:00 2004
@@ -183,7 +183,7 @@
                    *val = osf->val;  
             } else {
 	           /* parse the string into a NAD */
-                   nad = nad_parse(NULL, osf->val + 3, strlen(osf->val) - 3); 
+                   nad = nad_parse(NULL, ((char *) osf->val) + 3, strlen(osf->val) - 3); 
                    if(nad == NULL) {
                             /* unparseable NAD */
                             log_debug(ZONE, "cell returned from storage for key %s has unparseable XML content (%lu bytes)", key, strlen(osf->val)-3); 
diff -ur jabberd-2.0s5.orig/sm/sm.h jabberd-2.0s5/sm/sm.h
--- jabberd-2.0s5.orig/sm/sm.h	Sat Nov 13 17:08:33 2004
+++ sm/sm.h	Sun Dec  5 15:00:33 2004
@@ -267,7 +267,7 @@
     sess_t              next;               /**< next session (in a list of sessions) */
 };
 
-extern int      sm_lost_router;
+extern sig_atomic_t sm_lost_router;
 
 /* functions */
 xht             aci_load(sm_t sm);