From: Guenter Knauf <fuankg@apache.org>
Date: Tue, 7 Jul 2009 02:54:27 +0000 (+0000)
Subject: fixed types, fixed NetWare build.
X-Git-Tag: 2.3.3~459
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a427710d5e9db2b51de5820e2b8d6bb7a52f9890;p=thirdparty%2Fapache%2Fhttpd.git

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 d5f01fd67ec..b772a2bbcdd 100644
--- a/modules/cluster/NWGNUmodheartmonitor
+++ b/modules/cluster/NWGNUmodheartmonitor
@@ -215,6 +215,8 @@ FILES_nlm_Ximports = \
 	@$(APR)/aprlib.imp \
 	@$(NWOS)/httpd.imp \
 	@libc.imp \
+	(AP$(VERSION_MAJMIN)) ap_watchdog_get_instance \
+	(AP$(VERSION_MAJMIN)) ap_watchdog_register_callback \
 	$(EOLIST)
 
 #
diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c
index 0ef54337015..ca0b957de45 100644
--- 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;
 }