X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flibpspp%2Frange-tower-test.c;h=9270753a02adb521bd9f16ae1b3c397cdc79e8b8;hb=refs%2Fheads%2Fctables3;hp=f5da5e230e85856da63f28d81eda791170faa9e1;hpb=4bc7fb8814bc15858ab801be55b3b6cd79dd06e6;p=pspp

diff --git a/tests/libpspp/range-tower-test.c b/tests/libpspp/range-tower-test.c
index f5da5e230e..9270753a02 100644
--- a/tests/libpspp/range-tower-test.c
+++ b/tests/libpspp/range-tower-test.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -130,7 +130,7 @@ prev_region (unsigned int pattern, unsigned int offset,
   unsigned int i;
 
   assert (offset <= UINT_BIT);
-  for (i = offset; i-- > 0; )
+  for (i = offset; i-- > 0;)
     if (pattern & (1u << i))
       {
         *start = i;
@@ -150,7 +150,7 @@ prev_region (unsigned int pattern, unsigned int offset,
    or ULONG_MAX if none is found. */
 static unsigned long int
 next_1bit (unsigned int pattern, unsigned int offset,
-           unsigned int pattern_offset)
+           unsigned long int pattern_offset)
 {
   for (; offset < UINT_BIT; offset++)
     if (pattern & (1u << offset))
@@ -165,7 +165,7 @@ print_structure (const struct abt_node *node_)
 
   if (node_ == NULL)
     return;
-  node = abt_data (node_, struct range_tower_node, abt_node);
+  node = ABT_DATA (node_, struct range_tower_node, abt_node);
   printf ("%lu+%lu/%d", node->n_zeros, node->n_ones, node->abt_node.level);
   if (node->abt_node.down[0] || node->abt_node.down[1])
     {