Index: agent/helpers/row_merge.c
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/agent/helpers/row_merge.c,v
retrieving revision 5.15
diff -u -p -r5.15 row_merge.c
--- agent/helpers/row_merge.c   25 Jan 2006 16:25:53 -0000      5.15
+++ agent/helpers/row_merge.c   24 Aug 2006 16:34:30 -0000
@@ -31,7 +31,7 @@ netsnmp_get_row_merge_handler(int prefix
     ret = netsnmp_create_handler("row_merge",
                                   netsnmp_row_merge_helper_handler);
     if (ret) {
-        ret->myvoid = (void *) prefix_len;
+        ret->myvoid = (void *) ((size_t)prefix_len);
     }
     return ret;
 }
@@ -165,7 +165,7 @@ netsnmp_row_merge_helper_handler(netsnmp
      * Use the prefix length as supplied during registration, rather
      *  than trying to second-guess what the MIB implementer wanted.
      */
-    int SKIP_OID = (int)handler->myvoid;
+    size_t SKIP_OID = (size_t)handler->myvoid;

     DEBUGMSGTL(("helper:row_merge", "Got request (%d): ", SKIP_OID));
     DEBUGMSGOID(("helper:row_merge", reginfo->rootoid, reginfo->rootoid_len));