initial patch from gerdr++ for issue #236

This shouldn't go into master without some discussion and iteration.
parrot · Dec 20, 2011 · 2443cc6 · 2443cc6
1 parent 80e365d
commit 2443cc6
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/config/auto/memalign.pm b/config/auto/memalign.pm
@@ -76,12 +76,27 @@ sub _set_malloc_header {
 
 sub _set_ptrcast {
     my $conf = shift;
-    if ( $conf->data->get('ptrsize') == $conf->data->get('intsize') ) {
-        $conf->data->set( ptrcast => 'int' );
+
+    my $ptrsize = $conf->data->get('ptrsize');
+    my $ptrcast = $conf->data->get("int${ptrsize}_t");
+
+    # FIXME: find out if this actually does the right thing if intXX_t is
+    # not available
+    if ( defined $ptrcast ) {}
+    elsif ( $ptrsize == $conf->data->get('intsize') ) {
+        $ptrcast = 'int';
+    }
+    elsif ( $ptrsize == $conf->data->get('longsize') ) {
+        $ptrcast = 'long';
+    }
+    elsif ( $ptrsize == $conf->data->get('longlongsize') ) {
+        $ptrcast = 'long long';
     }
     else {
-        $conf->data->set( ptrcast => 'long' );
+        # TODO: fail properly
     }
+
+    $conf->data->set( ptrcast => $ptrcast );
 }
 
 sub _set_memalign {