Index: working_vm/vm/gc_gen/src/common/gc_common.h =================================================================== --- working_vm/vm/gc_gen/src/common/gc_common.h (revision 680908) +++ working_vm/vm/gc_gen/src/common/gc_common.h (working copy) @@ -312,7 +312,7 @@ inline Partial_Reveal_Object* obj_get_next_obj_from_vt(Partial_Reveal_Object* p_obj) { - return (Partial_Reveal_Object*)((VT_SIZE_INT)(POINTER_SIZE_INT)p_obj + (VT_SIZE_INT)obj_get_vt_raw(p_obj)); + return (Partial_Reveal_Object*)((POINTER_SIZE_INT)p_obj + (POINTER_SIZE_INT)(VT_SIZE_INT)obj_get_vt_raw(p_obj)); } /********************* for concurrent GC *******************************/ Index: working_classlib/modules/portlib/src/main/native/common/shared/iohelp.c =================================================================== --- working_classlib/modules/portlib/src/main/native/common/shared/iohelp.c (revision 680908) +++ working_classlib/modules/portlib/src/main/native/common/shared/iohelp.c (working copy) @@ -27,7 +27,7 @@ ioh_convertToPlatform (char *path) { char *pathIndex; - int length = strlen (path); + size_t length = strlen (path); /* Convert all separators to the same type */ pathIndex = path; @@ -49,20 +49,20 @@ { pathIndex++; } - if ((pathIndex > path) && (length > (pathIndex - path)) + if ((pathIndex > path) && ((int)length > (pathIndex - path)) && (*(pathIndex + 1) == ':')) { /* For Example '////c:/!*' (! added to avoid gcc warning) */ - int newlen = length - (pathIndex - path); + size_t newlen = length - (pathIndex - path); memmove (path, pathIndex, newlen); path[newlen] = '\0'; } else { - if ((pathIndex - path > 3) && (length > (pathIndex - path))) + if ((pathIndex - path > 3) && ((int)length > (pathIndex - path))) { /* For Example '////serverName/!*' (! added to avoid gcc warning) */ - int newlen = length - (pathIndex - path) + 2; + size_t newlen = length - (pathIndex - path) + 2; memmove (path, pathIndex - 2, newlen); path[newlen] = '\0'; } Index: working_classlib/modules/portlib/src/main/native/common/shared/strhelp.c =================================================================== --- working_classlib/modules/portlib/src/main/native/common/shared/strhelp.c (revision 680908) +++ working_classlib/modules/portlib/src/main/native/common/shared/strhelp.c (working copy) @@ -45,7 +45,7 @@ char *chunk = va_arg (argp, char *); if (chunk) { - concatenatedSize += strlen (chunk); + concatenatedSize += (UDATA)strlen (chunk); } else { @@ -111,8 +111,8 @@ /* missing delimiter means the whole line is the key and value is empty */ size_t keyLength = (delim ? delim : end) - start; size_t valueLength = delim ? end - delim - 1 : 0; - property->key = hymem_allocate_memory (keyLength + 1); - property->value = hymem_allocate_memory (valueLength + 1); + property->key = hymem_allocate_memory ((UDATA)(keyLength + 1)); + property->value = hymem_allocate_memory ((UDATA)(valueLength + 1)); if (!property->key || !property->value) { return 0;