Merge commit 'origin/stable'

[pspp-builds.git] / src / data / settings.h

diff --git a/src/data/settings.h b/src/data/settings.h
index 1838927de88ce7487ab70b3adcaa46a9559f645c..3de1715f0738595dc7fd53a4df82b34a96dc98f0 100644 (file)
--- a/src/data/settings.h
+++ b/src/data/settings.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 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
@@ -19,11 +19,13 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include "format.h"
+#include <data/format.h>
+#include <libpspp/float-format.h>
+#include <libpspp/integer-format.h>
 
+struct caseproto;
 struct settings;
 
-
 void settings_init (int *, int *);
 void settings_done (void);
 
@@ -105,14 +107,14 @@ char settings_get_endcmd (void);
 void settings_set_endcmd (char);
 
 size_t settings_get_workspace (void);
-size_t settings_get_workspace_cases (size_t value_cnt);
-void settings_set_workspace ( size_t);
+size_t settings_get_workspace_cases (const struct caseproto *);
+void settings_set_workspace (size_t);
 
 const struct fmt_spec *settings_get_format (void);
 void settings_set_format ( const struct fmt_spec *);
 
 bool settings_get_testing_mode (void);
-void settings_set_testing_mode ( bool);
+void settings_set_testing_mode (bool);
 
 enum behavior_mode {
   ENHANCED,             /* Use improved PSPP behavior. */
@@ -127,6 +129,7 @@ void settings_set_syntax (enum behavior_mode);
 void settings_set_cmd_algorithm (enum behavior_mode);
 void unset_cmd_algorithm (void);
 
+enum fmt_type;
 bool settings_set_cc (const char *cc_string, enum fmt_type type);
 
 int settings_get_decimal_char (enum fmt_type type);