pivot-table: Reduce size of struct pivot_value from 96 bytes to 80.

[pspp] / src / data / settings.h

diff --git a/src/data/settings.h b/src/data/settings.h
index 8ab7357d0a4167c676a34a04d521d1b56dfa8b1a..1361bef3747cd7afe781d76fab9e5ceaf9c4732c 100644 (file)
--- 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,7 +73,6 @@ 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);
@@ -107,7 +107,7 @@ void settings_set_fuzzbits (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.
@@ -143,11 +143,12 @@ 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);
 void settings_set_decimal_char (char decimal);
 
+const struct fmt_settings *settings_get_fmt_settings (void);
 
-const struct fmt_number_style * settings_get_style (enum fmt_type type);
+double settings_get_small (void);
+void settings_set_small (double);
 
 char * settings_dollar_template (const struct fmt_spec *fmt);