httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r791682 - in /httpd/httpd/trunk/modules/cluster: NWGNUmodheartmonitor mod_heartmonitor.c
Date Tue, 07 Jul 2009 02:54:27 GMT
Author: fuankg
Date: Tue Jul  7 02:54:27 2009
New Revision: 791682

URL: http://svn.apache.org/viewvc?rev=791682&view=rev
Log:
fixed types, fixed NetWare build.

Modified:
    httpd/httpd/trunk/modules/cluster/NWGNUmodheartmonitor
    httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c

Modified: httpd/httpd/trunk/modules/cluster/NWGNUmodheartmonitor
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/NWGNUmodheartmonitor?rev=791682&r1=791681&r2=791682&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/NWGNUmodheartmonitor (original)
+++ httpd/httpd/trunk/modules/cluster/NWGNUmodheartmonitor Tue Jul  7 02:54:27 2009
@@ -215,6 +215,8 @@
 	@$(APR)/aprlib.imp \
 	@$(NWOS)/httpd.imp \
 	@libc.imp \
+	(AP$(VERSION_MAJMIN)) ap_watchdog_get_instance \
+	(AP$(VERSION_MAJMIN)) ap_watchdog_register_callback \
 	$(EOLIST)
 
 #

Modified: httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c?rev=791682&r1=791681&r2=791682&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c (original)
+++ httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c Tue Jul  7 02:54:27 2009
@@ -200,7 +200,7 @@
     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 @@
         /* 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;
 }



Mime
View raw message