X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fsettings.h;h=76988b2719c73dc70bf169060d5dced39ab4bf28;hb=refs%2Fheads%2Frust;hp=f485ce152cf8e22cf90a40fb75b53ad3f408ac57;hpb=07da9f454c17fb961cae09f6d7d505f7abb281c0;p=pspp

diff --git a/src/data/settings.h b/src/data/settings.h
index f485ce152c..76988b2719 100644
--- a/src/data/settings.h
+++ b/src/data/settings.h
@@ -21,6 +21,7 @@
 #include <stddef.h>
 
 #include "data/format.h"
+#include "libpspp/compiler.h"
 #include "libpspp/float-format.h"
 #include "libpspp/integer-format.h"
 #include "libpspp/message.h"
@@ -72,6 +73,7 @@ void settings_set_safer_mode (void);
 bool settings_get_include (void);
 void settings_set_include (bool);
 
+int settings_get_epoch (void);
 void settings_set_epoch (int);
 
 bool settings_get_scompression (void);
@@ -85,9 +87,19 @@ void settings_set_blanks (double);
 int settings_get_max_messages (enum msg_severity);
 void settings_set_max_messages (enum msg_severity, int max);
 
+/* Macro settings. */
+bool settings_get_mexpand (void);
+void settings_set_mexpand (bool);
+
 bool settings_get_mprint (void);
 void settings_set_mprint (bool);
 
+int settings_get_miterate (void);
+void settings_set_miterate (int);
+
+int settings_get_mnest (void);
+void settings_set_mnest (int);
+
 int settings_get_mxloops (void);
 void settings_set_mxloops (int);
 
@@ -95,8 +107,8 @@ size_t settings_get_workspace (void);
 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 *);
+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);
@@ -104,9 +116,12 @@ void settings_set_testing_mode (bool);
 int settings_get_fuzzbits (void);
 void settings_set_fuzzbits (int);
 
+int settings_get_scalemin (void);
+void settings_set_scalemin (int);
+
 /* Whether to show variable or value labels or the underlying value or variable
    name. */
-enum settings_value_show
+enum ATTRIBUTE ((packed)) settings_value_show
   {
     /* Use higher-level default.
        In a pivot_value, the default is taken from the pivot_table.
@@ -140,13 +155,17 @@ 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);
+char *settings_set_cc (const char *cc_string, enum fmt_type) WARN_UNUSED_RESULT;
 
 void settings_set_decimal_char (char decimal);
+void settings_set_include_leading_zero (bool include_leading_zero);
 
 const struct fmt_settings *settings_get_fmt_settings (void);
 
-char * settings_dollar_template (const struct fmt_spec *fmt);
+double settings_get_small (void);
+void settings_set_small (double);
+
+char *settings_dollar_template (struct fmt_spec);
 
 /* Routing of different kinds of output. */
 enum settings_output_devices
@@ -172,4 +191,13 @@ void settings_set_output_routing (enum settings_output_type,
 enum settings_output_devices settings_get_output_routing (
   enum settings_output_type);
 
+enum settings_mdisplay
+  {
+    SETTINGS_MDISPLAY_TEXT,
+    SETTINGS_MDISPLAY_TABLES
+  };
+
+enum settings_mdisplay settings_get_mdisplay (void);
+void settings_set_mdisplay (enum settings_mdisplay);
+
 #endif /* !settings_h */