X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fmerge.h;h=5fdb6fc062d24d692b1d3b95552690d00e9fd793;hb=38d5e09c01ddffc98430c3c55ed3ccb821180cbf;hp=18322e84bf7f9c2a614a2f9d666412d0b467cfe5;hpb=8407e8566f02d768975e0fc1b8cb650b12f5239a;p=pspp-builds.git

diff --git a/src/math/merge.h b/src/math/merge.h
index 18322e84..5fdb6fc0 100644
--- 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 *);