Merge commit 'origin/stable'

[pspp-builds.git] / src / math / merge.h

diff --git a/src/math/merge.h b/src/math/merge.h
index 18322e84bf7f9c2a614a2f9d666412d0b467cfe5..5fdb6fc062d24d692b1d3b95552690d00e9fd793 100644 (file)
--- a/src/math/merge.h
+++ b/src/math/merge.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   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
@@ -17,13 +17,11 @@
 #ifndef MATH_MERGE_H
 #define MATH_MERGE_H 1
 
-#include <stdbool.h>
-#include <stddef.h>
-
-struct case_ordering;
+struct caseproto;
 struct casereader;
+struct subcase;
 
-struct merge *merge_create (const struct case_ordering *, size_t);
+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 *);