X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fmath%2Fmerge.h;h=5fdb6fc062d24d692b1d3b95552690d00e9fd793;hb=2f3f4d9b20e0cde593fad4137cdc48922a38c3da;hp=61852057b42a4edc8461581f5c462cfb741d29fe;hpb=92c09e564002d356d20fc1e2e131027ef89f6748;p=pspp
diff --git a/src/math/merge.h b/src/math/merge.h
index 61852057b4..5fdb6fc062 100644
--- a/src/math/merge.h
+++ b/src/math/merge.h
@@ -1,30 +1,27 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2007 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2007, 2009 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 . */
#ifndef MATH_MERGE_H
#define MATH_MERGE_H 1
-#include
-
-struct case_ordering;
+struct caseproto;
struct casereader;
+struct subcase;
-struct merge *merge_create (const struct case_ordering *);
+struct merge *merge_create (const struct subcase *, const struct caseproto *);
void merge_destroy (struct merge *);
void merge_append (struct merge *, struct casereader *);
struct casereader *merge_make_reader (struct merge *);