From a427710d5e9db2b51de5820e2b8d6bb7a52f9890 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Tue, 7 Jul 2009 02:54:27 +0000 Subject: [PATCH] fixed types, fixed NetWare build. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@791682 13f79535-47bb-0310-9956-ffa450edef68 --- modules/cluster/NWGNUmodheartmonitor | 2 ++ modules/cluster/mod_heartmonitor.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/cluster/NWGNUmodheartmonitor b/modules/cluster/NWGNUmodheartmonitor index d5f01fd67e..b772a2bbcd 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 0ef5433701..ca0b957de4 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; } -- 2.50.1