Update all #include directives to the currently preferred style.

[pspp-builds.git] / src / libpspp / range-map.h

diff --git a/src/libpspp/range-map.h b/src/libpspp/range-map.h
index 8a5f6f43ce59177ecda3dbd8cce9e3a7511be69c..2d4b5ade334fcdad52a00f1b46b6aa37f9e7b6ec 100644 (file)
--- a/src/libpspp/range-map.h
+++ b/src/libpspp/range-map.h
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 2007, 2009, 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 the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef LIBPSPP_RANGE_MAP_H
 #define LIBPSPP_RANGE_MAP_H
@@ -34,16 +32,18 @@
 
 #include <stdbool.h>
 
-#include <libpspp/bt.h>
+#include "libpspp/bt.h"
+#include "libpspp/cast.h"
 
 /* Returns the data structure corresponding to the given NODE,
    assuming that NODE is embedded as the given MEMBER name in
    data type STRUCT. */
 #define range_map_data(NODE, STRUCT, MEMBER)                            \
-        ((STRUCT *) ((char *) (NODE) - offsetof (STRUCT, MEMBER)))
+        (CHECK_POINTER_HAS_TYPE (NODE, struct range_map_node *),        \
+         UP_CAST (NODE, STRUCT, MEMBER))
 
 /* A range map node, to be embedded in the data value. */
-struct range_map_node 
+struct range_map_node
   {
     struct bt_node bt_node;     /* Balanced tree node. */
     unsigned long int start;    /* Start of range. */
@@ -52,27 +52,27 @@ struct range_map_node
 
 /* Returns the start of the range in the given NODE. */
 static inline unsigned long int
-range_map_node_get_start (const struct range_map_node *node) 
+range_map_node_get_start (const struct range_map_node *node)
 {
   return node->start;
 }
 
 /* Returns the end of the range in the given NODE, plus one. */
 static inline unsigned long int
-range_map_node_get_end (const struct range_map_node *node) 
+range_map_node_get_end (const struct range_map_node *node)
 {
   return node->end;
 }
 
 /* Returns the width of the range in the given NODE. */
 static inline unsigned long int
-range_map_node_get_width (const struct range_map_node *node) 
+range_map_node_get_width (const struct range_map_node *node)
 {
   return node->end - node->start;
 }
 \f
 /* Range map. */
-struct range_map 
+struct range_map
   {
     struct bt bt;
   };