projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
src
/
libpspp
/
bt.c
diff --git
a/src/libpspp/bt.c
b/src/libpspp/bt.c
index 751c8fe764cd6f71aeec94be3550855f8dd3ce6e..4178d1475af769810a3f193d3af3d1afb5c48797 100644
(file)
--- a/
src/libpspp/bt.c
+++ b/
src/libpspp/bt.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009
, 2010, 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
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
@@
-61,13
+61,13
@@
#include <config.h>
#endif
#include <config.h>
#endif
-#include
<libpspp/bt.h>
+#include
"libpspp/bt.h"
#include <limits.h>
#include <stdbool.h>
#include <stdint.h>
#include <limits.h>
#include <stdbool.h>
#include <stdint.h>
-#include
<libpspp/cast.h>
+#include
"libpspp/cast.h"
static void rebalance_subtree (struct bt *, struct bt_node *, size_t);
static void rebalance_subtree (struct bt *, struct bt_node *, size_t);
@@
-81,9
+81,7
@@
static inline int calculate_h_alpha (size_t);
/* Initializes BT as an empty BT that uses the given COMPARE
function, passing in AUX as auxiliary data. */
void
/* Initializes BT as an empty BT that uses the given COMPARE
function, passing in AUX as auxiliary data. */
void
-bt_init (struct bt *bt,
- bt_compare_func *compare,
- const void *aux)
+bt_init (struct bt *bt, bt_compare_func *compare, const void *aux)
{
bt->root = NULL;
bt->compare = compare;
{
bt->root = NULL;
bt->compare = compare;