fixed types, fixed NetWare build.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@791682 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/cluster/NWGNUmodheartmonitor b/modules/cluster/NWGNUmodheartmonitor
index d5f01fd67ecd068c8e65c4fbf91d9f1c4703b84a..b772a2bbcdd5bf73ba9d26c93117a49cabd60afe 100644 (file)
--- a/modules/cluster/NWGNUmodheartmonitor
+++ b/modules/cluster/NWGNUmodheartmonitor
@@ -215,6 +215,8 @@ FILES_nlm_Ximports = \
        @$(APR)/aprlib.imp \\r
        @$(NWOS)/httpd.imp \\r
        @libc.imp \\r
+       (AP$(VERSION_MAJMIN)) ap_watchdog_get_instance \\r
+       (AP$(VERSION_MAJMIN)) ap_watchdog_register_callback \\r
        $(EOLIST)\r
 \r
 #\r

diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c
index 0ef5433701593171b5f573283ecf0a3151213ce0..ca0b957de456adcc0435144a49c9b3988d81a9c1 100644 (file)
--- a/modules/cluster/mod_heartmonitor.c
+++ b/modules/cluster/mod_heartmonitor.c
@@ -200,7 +200,7 @@ static  apr_status_t  hm_slotmem_update_stat(hm_server_t *s, request_rec *r)
     ctx.updated = 0;
     storage->doall(slotmem, hm_update, &ctx, r->pool);
     if (!ctx.updated) {
-        int i;
+        unsigned int i;
         hm_slot_server_t hmserver;
         memcpy(hmserver.ip, s->ip, MAXIPSIZE);
         hmserver.busy = s->busy;
@@ -209,7 +209,7 @@ static  apr_status_t  hm_slotmem_update_stat(hm_server_t *s, request_rec *r)
         /* XXX locking for grab() / put() */
         storage->grab(slotmem, &i);
         hmserver.id = i;
-        storage->put(slotmem, i, (char *)&hmserver, sizeof(hmserver));
+        storage->put(slotmem, i, (unsigned char *)&hmserver, sizeof(hmserver));
     }
     return APR_SUCCESS;
 }