Clean up unit discovery

diff --git a/Makefile.PL b/Makefile.PL
index cd341adbc211100fb67adc5a76c495445783d4a0..c56d8b54c77d885ecf2bf1a12cd9dd06310b55a1 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -119,23 +119,23 @@ if (defined $cc and defined $ld) {
  $PARAMS{CC} = $cc;
  $PARAMS{LD} = $ld;
 
- my $unit = { bits => 8, size => 1 };
+ my $bits = 8;
  if (not is_little_endian()) {
   print "Forcing unit size of 8 on non-little-endian systems.\n";
  } else {
   print "Checking unit size in bits... ";
+  my $size  = 1;
   my $align = $Config{alignbytes} || 1;
-  my @bits = (8, 16, 32, 64);
-  for my $bits (@bits) {
-   my $size = $Config{"u${bits}size"};
-   next unless $size;
-   $unit = { bits => $bits, size => $size } if $size && $size <= $align;
+  my @units = (8, 16, 32, 64);
+  for my $unit (@units) {
+   my $unit_size = $Config{"u${unit}size"};
+   if ($unit_size and $unit_size <= $align) {
+    $bits = $unit;
+    $size = $unit_size;
+   }
   }
-  print $unit->{bits},
-                " (actually $unit->{size} bytes for $align bytes alignment).\n";
+  print "$bits (actually $size bytes for $align bytes alignment).\n";
  }
-
- my $bits = $unit->{bits};
  push @DEFINES, '-DBV_UNIT="' . ($Config{"u${bits}type"} || "U$bits") . '"';
  push @DEFINES, "-DSVU_SIZE=$bits";
 } else {