X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Frange-map.c;h=104566bca8e2463469dc36805af77ce85e8bf98d;hb=9d24b4fb4d831d7a2bebb51fd111726f0e682e45;hp=0d6ce8263078674b321898ac4a38e6533a54d77a;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp diff --git a/src/libpspp/range-map.c b/src/libpspp/range-map.c index 0d6ce82630..104566bca8 100644 --- a/src/libpspp/range-map.c +++ b/src/libpspp/range-map.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007, 2011 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 @@ -16,10 +16,10 @@ #include -#include +#include "libpspp/range-map.h" -#include -#include +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" static struct range_map_node *bt_to_range_map_node (const struct bt_node *); static int compare_range_map_nodes (const struct bt_node *, @@ -114,7 +114,7 @@ static struct range_map_node * bt_to_range_map_node (const struct bt_node *bt_node) { return (bt_node != NULL - ? bt_data (bt_node, struct range_map_node, bt_node) + ? BT_DATA (bt_node, struct range_map_node, bt_node) : NULL); }