ENH: add support for win64 for visual studio 2005 ide and nmake, also fix warnings produced by building for win64

10 files changed, 31 insertions, 31 deletions

diff --git a/Utilities/cmxmlrpc/xmlrpc_array.c b/Utilities/cmxmlrpc/xmlrpc_array.c
index 31576f0..36010c6 100644
--- a/Utilities/cmxmlrpc/xmlrpc_array.c
+++ b/Utilities/cmxmlrpc/xmlrpc_array.c
@@ -22,7 +22,7 @@ xmlrpc_abort_if_array_bad(xmlrpc_value * const arrayP) {
     else if (arrayP->_type != XMLRPC_TYPE_ARRAY)
         abort();
     else {
-        unsigned int const arraySize =
+        size_t const arraySize =
             XMLRPC_MEMBLOCK_SIZE(xmlrpc_value*, &arrayP->_block);
         xmlrpc_value ** const contents = 
             XMLRPC_MEMBLOCK_CONTENTS(xmlrpc_value*, &arrayP->_block);
@@ -51,7 +51,7 @@ xmlrpc_destroyArrayContents(xmlrpc_value * const arrayP) {
    Dispose of the contents of an array (but not the array value itself).
    The value is not valid after this.
 -----------------------------------------------------------------------------*/
-    unsigned int const arraySize =
+    size_t const arraySize =
         XMLRPC_MEMBLOCK_SIZE(xmlrpc_value*, &arrayP->_block);
     xmlrpc_value ** const contents = 
         XMLRPC_MEMBLOCK_CONTENTS(xmlrpc_value*, &arrayP->_block);
@@ -83,7 +83,7 @@ xmlrpc_array_size(xmlrpc_env *         const env,
     XMLRPC_ASSERT_VALUE_OK(array);
     XMLRPC_TYPE_CHECK(env, array, XMLRPC_TYPE_ARRAY);
 
-    retval = XMLRPC_TYPED_MEM_BLOCK_SIZE(xmlrpc_value*, &array->_block);
+    retval = (int)XMLRPC_TYPED_MEM_BLOCK_SIZE(xmlrpc_value*, &array->_block);
 
                   cleanup:
     if (env->fault_occurred)
diff --git a/Utilities/cmxmlrpc/xmlrpc_client.c b/Utilities/cmxmlrpc/xmlrpc_client.c
index 329b160..a5ad65c 100644
--- a/Utilities/cmxmlrpc/xmlrpc_client.c
+++ b/Utilities/cmxmlrpc/xmlrpc_client.c
@@ -269,7 +269,7 @@ call_info_new(xmlrpc_env *         const envP,
                 if (!envP->fault_occurred) {
                     xmlrpc_traceXml("XML-RPC CALL", 
                                     XMLRPC_MEMBLOCK_CONTENTS(char, callXmlP),
-                                    XMLRPC_MEMBLOCK_SIZE(char, callXmlP));
+                                    (unsigned int)XMLRPC_MEMBLOCK_SIZE(char, callXmlP));
         
                     callInfoP->serialized_xml = callXmlP;
 
@@ -312,7 +312,7 @@ clientCallServerParams(xmlrpc_env *             const envP,
             if (!envP->fault_occurred) {
                 xmlrpc_traceXml("XML-RPC RESPONSE", 
                                 XMLRPC_MEMBLOCK_CONTENTS(char, respXmlP),
-                                XMLRPC_MEMBLOCK_SIZE(char, respXmlP));
+                                (unsigned int)XMLRPC_MEMBLOCK_SIZE(char, respXmlP));
             
                 *resultPP = xmlrpc_parse_response(
                     envP,
diff --git a/Utilities/cmxmlrpc/xmlrpc_data.c b/Utilities/cmxmlrpc/xmlrpc_data.c
index fc6840f..0d3c3ca 100644
--- a/Utilities/cmxmlrpc/xmlrpc_data.c
+++ b/Utilities/cmxmlrpc/xmlrpc_data.c
@@ -254,12 +254,12 @@ xmlrpc_read_string(xmlrpc_env *         const envP,
 -----------------------------------------------------------------------------*/
     validateType(envP, valueP, XMLRPC_TYPE_STRING);
     if (!envP->fault_occurred) {
-        unsigned int const size = 
+        size_t const size = 
             XMLRPC_MEMBLOCK_SIZE(char, &valueP->_block);
         const char * const contents = 
             XMLRPC_MEMBLOCK_CONTENTS(char, &valueP->_block);
 
-        verifyNoNulls(envP, contents, size);
+        verifyNoNulls(envP, contents, (unsigned int)size);
         if (!envP->fault_occurred) {
             char * stringValue;
             
@@ -289,7 +289,7 @@ xmlrpc_read_string_lp(xmlrpc_env *         const envP,
 
     validateType(envP, valueP, XMLRPC_TYPE_STRING);
     if (!envP->fault_occurred) {
-        unsigned int const size = 
+        size_t const size = 
             XMLRPC_MEMBLOCK_SIZE(char, &valueP->_block);
         const char * const contents = 
             XMLRPC_MEMBLOCK_CONTENTS(char, &valueP->_block);
@@ -304,7 +304,7 @@ xmlrpc_read_string_lp(xmlrpc_env *         const envP,
         else {
             memcpy(stringValue, contents, size);
             *stringValueP = stringValue;
-            *lengthP = size;
+            *lengthP = (unsigned int)size;
         }
     }
 }
@@ -449,7 +449,7 @@ getString(xmlrpc_env *    const envP,
           xmlrpc_value ** const valPP) {
 
     const char * str;
-    unsigned int len;
+    size_t len;
     
     str = (const char*) va_arg(*args, char*);
     if (**formatP == '#') {
@@ -458,7 +458,7 @@ getString(xmlrpc_env *    const envP,
     } else
         len = strlen(str);
 
-    mkString(envP, str, len, valPP);
+    mkString(envP, str, (unsigned int)len, valPP);
 }
 
 
@@ -1143,7 +1143,7 @@ parsevalue(xmlrpc_env *   const envP,
                 (*format)++;
                 *sizeptr = len;
             } else
-                verifyNoNulls(envP, contents, len);
+                verifyNoNulls(envP, contents, (unsigned int)len);
             *strptr = contents;
         }
         break;
@@ -1173,7 +1173,7 @@ parsevalue(xmlrpc_env *   const envP,
                     (*format)++;
                     *sizeptr = len;
                 } else
-                    verifyNoNullsW(envP, wcontents, len);
+                    verifyNoNullsW(envP, wcontents, (unsigned int)len);
                 *wcsptr = wcontents;
             }
         }
diff --git a/Utilities/cmxmlrpc/xmlrpc_expat.c b/Utilities/cmxmlrpc/xmlrpc_expat.c
index 7fbc0c9..cb467d1 100644
--- a/Utilities/cmxmlrpc/xmlrpc_expat.c
+++ b/Utilities/cmxmlrpc/xmlrpc_expat.c
@@ -139,7 +139,7 @@ void xml_element_free (xml_element *elem)
     /* Deallocate all of our children recursively. */
     children = &elem->_children;
     contents = XMLRPC_TYPED_MEM_BLOCK_CONTENTS(xml_element*, children);
-    size = XMLRPC_TYPED_MEM_BLOCK_SIZE(xml_element*, children);
+    size = (int)XMLRPC_TYPED_MEM_BLOCK_SIZE(xml_element*, children);
     for (i = 0; i < size; i++)
         xml_element_free(contents[i]);
 
diff --git a/Utilities/cmxmlrpc/xmlrpc_parse.c b/Utilities/cmxmlrpc/xmlrpc_parse.c
index 74e4c2d..0999eb6 100644
--- a/Utilities/cmxmlrpc/xmlrpc_parse.c
+++ b/Utilities/cmxmlrpc/xmlrpc_parse.c
@@ -248,7 +248,7 @@ static xmlrpc_value *
 convert_value(xmlrpc_env *env, unsigned *depth, xml_element *elem)
 {
     xml_element *child;
-    int child_count;
+    size_t child_count;
     char *cdata, *child_name;
     size_t cdata_size, ascii_len;
     xmlrpc_mem_block *decoded;
@@ -356,7 +356,7 @@ convert_array(xmlrpc_env *env, unsigned *depth, xml_element *elem)
 {
     xml_element *data, **values, *value;
     xmlrpc_value *array, *item;
-    int size, i;
+    size_t size, i;
 
     XMLRPC_ASSERT_ENV_OK(env);
     XMLRPC_ASSERT(elem != NULL);
@@ -413,7 +413,7 @@ convert_struct(xmlrpc_env *env, unsigned *depth, xml_element *elem)
 {
     xmlrpc_value *strct, *key, *value;
     xml_element **members, *member, *name_elem, *value_elem;
-    int size, i;
+    size_t size, i;
     char *cdata;
     size_t cdata_size;
 
@@ -490,7 +490,7 @@ static xmlrpc_value *
 convert_params(xmlrpc_env *env, unsigned *depth, xml_element *elem)
 {
     xmlrpc_value *array, *item;
-    int size, i;
+    size_t size, i;
     xml_element **params, *param, *value;
 
     XMLRPC_ASSERT_ENV_OK(env);
@@ -546,7 +546,7 @@ parseCallXml(xmlrpc_env *   const envP,
     xmlrpc_env env;
 
     xmlrpc_env_init(&env);
-    *callElemP = xml_parse(&env, xmlData, xmlLen);
+    *callElemP = xml_parse(&env, xmlData, (int)xmlLen);
     if (env.fault_occurred)
         xmlrpc_env_set_fault_formatted(
             envP, env.fault_code, "Call is not valid XML.  %s",
@@ -697,7 +697,7 @@ xmlrpc_parse_response(xmlrpc_env *env,
     depth = 0;
 
     /* Parse our XML data. */
-    response = xml_parse(env, xml_data, xml_len);
+    response = xml_parse(env, xml_data, (int)xml_len);
     XMLRPC_FAIL_IF_FAULT(env);
 
     /* Pick apart and verify our structure. */
diff --git a/Utilities/cmxmlrpc/xmlrpc_registry.c b/Utilities/cmxmlrpc/xmlrpc_registry.c
index a0498b1..ae3b21c 100644
--- a/Utilities/cmxmlrpc/xmlrpc_registry.c
+++ b/Utilities/cmxmlrpc/xmlrpc_registry.c
@@ -367,7 +367,7 @@ xmlrpc_registry_process_call(xmlrpc_env *      const envP,
     XMLRPC_ASSERT_ENV_OK(envP);
     XMLRPC_ASSERT_PTR_OK(xml_data);
     
-    xmlrpc_traceXml("XML-RPC CALL", xml_data, xml_len);
+    xmlrpc_traceXml("XML-RPC CALL", xml_data, (unsigned int)xml_len);
 
     /* Allocate our output buffer.
     ** If this fails, we need to die in a special fashion. */
@@ -412,7 +412,7 @@ xmlrpc_registry_process_call(xmlrpc_env *      const envP,
         else
             xmlrpc_traceXml("XML-RPC RESPONSE", 
                             XMLRPC_MEMBLOCK_CONTENTS(char, output),
-                            XMLRPC_MEMBLOCK_SIZE(char, output));
+                            (unsigned int)XMLRPC_MEMBLOCK_SIZE(char, output));
     }
     return output;
 }
@@ -507,7 +507,7 @@ system_multicall(xmlrpc_env *env,
     size = xmlrpc_array_size(env, methlist);
     XMLRPC_ASSERT_ENV_OK(env);
     for (i = 0; i < size; i++) {
-        methinfo = xmlrpc_array_get_item(env, methlist, i);
+        methinfo = xmlrpc_array_get_item(env, methlist, (int)i);
         XMLRPC_ASSERT_ENV_OK(env);
         
         /* Call our method. */
@@ -588,7 +588,7 @@ system_listMethods(xmlrpc_env *env,
     size = xmlrpc_struct_size(env, registry->_methods);
     XMLRPC_FAIL_IF_FAULT(env);
     for (i = 0; i < size; i++) {
-        xmlrpc_struct_get_key_and_value(env, registry->_methods, i,
+        xmlrpc_struct_get_key_and_value(env, registry->_methods, (int)i,
                                         &method_name, &method_info);
         XMLRPC_FAIL_IF_FAULT(env);
         xmlrpc_array_append_item(env, method_names, method_name);
diff --git a/Utilities/cmxmlrpc/xmlrpc_serialize.c b/Utilities/cmxmlrpc/xmlrpc_serialize.c
index debf218..5315ff9 100644
--- a/Utilities/cmxmlrpc/xmlrpc_serialize.c
+++ b/Utilities/cmxmlrpc/xmlrpc_serialize.c
@@ -295,7 +295,7 @@ xmlrpc_serialize_struct(xmlrpc_env *env,
     size = xmlrpc_struct_size(env, strct);
     XMLRPC_FAIL_IF_FAULT(env);
     for (i = 0; i < size; i++) {
-        xmlrpc_struct_get_key_and_value(env, strct, i, &key, &value);
+        xmlrpc_struct_get_key_and_value(env, strct, (int)i, &key, &value);
         XMLRPC_FAIL_IF_FAULT(env);
         format_out(env, output, "<member><name>");
         XMLRPC_FAIL_IF_FAULT(env);
@@ -379,7 +379,7 @@ xmlrpc_serialize_value(xmlrpc_env *env,
         size = xmlrpc_array_size(env, value);
         XMLRPC_FAIL_IF_FAULT(env);
         for (i = 0; i < size; i++) {
-            item = xmlrpc_array_get_item(env, value, i);
+            item = xmlrpc_array_get_item(env, value, (int)i);
             XMLRPC_FAIL_IF_FAULT(env);
             xmlrpc_serialize_value(env, output, item);
             XMLRPC_FAIL_IF_FAULT(env);
@@ -469,7 +469,7 @@ xmlrpc_serialize_params(xmlrpc_env *env,
     for (i = 0; i < size; i++) {
         format_out(env, output, "<param>");
         XMLRPC_FAIL_IF_FAULT(env);
-        item = xmlrpc_array_get_item(env, param_array, i);
+        item = xmlrpc_array_get_item(env, param_array, (int)i);
         XMLRPC_FAIL_IF_FAULT(env);
         xmlrpc_serialize_value(env, output, item);
         XMLRPC_FAIL_IF_FAULT(env);
diff --git a/Utilities/cmxmlrpc/xmlrpc_struct.c b/Utilities/cmxmlrpc/xmlrpc_struct.c
index 6dbbd66..50cc6db 100644
--- a/Utilities/cmxmlrpc/xmlrpc_struct.c
+++ b/Utilities/cmxmlrpc/xmlrpc_struct.c
@@ -120,7 +120,7 @@ xmlrpc_struct_size(xmlrpc_env* env, xmlrpc_value* strct)
     XMLRPC_ASSERT_VALUE_OK(strct);
 
     XMLRPC_TYPE_CHECK(env, strct, XMLRPC_TYPE_STRUCT);
-    retval = XMLRPC_MEMBLOCK_SIZE(_struct_member, &strct->_block);
+    retval = (int)XMLRPC_MEMBLOCK_SIZE(_struct_member, &strct->_block);
 
  cleanup:
     if (env->fault_occurred)
@@ -186,7 +186,7 @@ find_member(xmlrpc_value * const strctP,
             keystr = XMLRPC_MEMBLOCK_CONTENTS(char, &keyval->_block);
             keystr_size = XMLRPC_MEMBLOCK_SIZE(char, &keyval->_block)-1;
             if (key_len == keystr_size && memcmp(key, keystr, key_len) == 0)
-                return i;
+                return (int)i;
         }   
     }
     return -1;
diff --git a/Utilities/cmxmlrpc/xmlrpc_strutil.c b/Utilities/cmxmlrpc/xmlrpc_strutil.c
index 1f1b9a7..8efdb40 100644
--- a/Utilities/cmxmlrpc/xmlrpc_strutil.c
+++ b/Utilities/cmxmlrpc/xmlrpc_strutil.c
@@ -19,7 +19,7 @@ xmlrpc_makePrintable(const char * const input) {
    get the storage.
 -----------------------------------------------------------------------------*/
     char * output;
-    const unsigned int inputLength = strlen(input);
+    const size_t inputLength = strlen(input);
 
     output = malloc(inputLength*4+1);
 
diff --git a/Utilities/cmxmlrpc/xmlrpc_support.c b/Utilities/cmxmlrpc/xmlrpc_support.c
index 4b0923a..ac29a12 100644
--- a/Utilities/cmxmlrpc/xmlrpc_support.c
+++ b/Utilities/cmxmlrpc/xmlrpc_support.c
@@ -326,7 +326,7 @@ xmlrpc_mem_block_append(xmlrpc_env *       const env,
                         void *             const data, 
                         size_t             const len)
 {
-    int size;
+    size_t size;
 
     XMLRPC_ASSERT_ENV_OK(env);
     XMLRPC_ASSERT(block != NULL);