Fixup compilation problems with ruby trunk on linux

3 files changed, 3 insertions, 3 deletions

diff --git a/ext/ffi_c/AbstractMemory.c b/ext/ffi_c/AbstractMemory.c
index 088cba6..50a3bad 100644
--- a/ext/ffi_c/AbstractMemory.c
+++ b/ext/ffi_c/AbstractMemory.c
@@ -228,7 +228,7 @@ memory_get_array_of_string(int argc, VALUE* argv, VALUE self)
 
     } else {
         checkBounds(ptr, off, sizeof (char*));
-        for ( ; off < ptr->size - sizeof (void *); off += sizeof (void *)) {
+        for ( ; off < ptr->size - (long) sizeof (void *); off += (long) sizeof (void *)) {
             const char* strptr = *(const char**) (ptr->address + off);
             if (strptr == NULL) {
                 break;
diff --git a/ext/ffi_c/Struct.c b/ext/ffi_c/Struct.c
index 6a6d066..a656f57 100644
--- a/ext/ffi_c/Struct.c
+++ b/ext/ffi_c/Struct.c
@@ -745,7 +745,7 @@ inline_array_to_ptr(VALUE self)
     Data_Get_Struct(rbPointer, AbstractMemory, ptr);
     
     // Restrict the size of the pointer so ops like ptr.get_string(0) are bounds checked
-    ptr->size = MIN(ptr->size, array->field->type->ffiType->size);
+    ptr->size = MIN(ptr->size, (long) array->field->type->ffiType->size);
 
     return rbPointer;
 }
diff --git a/ext/ffi_c/StructLayout.c b/ext/ffi_c/StructLayout.c
index 5af9bd9..85b444f 100644
--- a/ext/ffi_c/StructLayout.c
+++ b/ext/ffi_c/StructLayout.c
@@ -337,7 +337,7 @@ struct_layout_initialize(VALUE self, VALUE field_names, VALUE fields, VALUE size
     layout->base.ffiType->alignment = 1;
 
     ltype = layout->base.ffiType;
-    for (i = 0; i < layout->fieldCount; ++i) {
+    for (i = 0; i < (int) layout->fieldCount; ++i) {
         VALUE rbName = rb_ary_entry(field_names, i);
         VALUE rbField = rb_hash_aref(fields, rbName);
         StructField* field;