X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fsettings.h;h=da009abdcac2cc8f8d9b7e1f1d0decf019544b79;hb=136d243060f851e01ef46e72b9b554059b5ae544;hp=4bdc65d1fe32cc2cb5e9a756145234d2ce229e3d;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git

diff --git a/src/data/settings.h b/src/data/settings.h
index 4bdc65d1..da009abd 100644
--- a/src/data/settings.h
+++ b/src/data/settings.h
@@ -1,5 +1,5 @@
 /* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
    Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
@@ -23,15 +23,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-/* Types of routing. */
-enum
-  {
-    SET_ROUTE_SCREEN = 001,	/* Output to screen devices? */
-    SET_ROUTE_LISTING = 002,	/* Output to listing devices? */
-    SET_ROUTE_OTHER = 004,	/* Output to other devices? */
-    SET_ROUTE_DISABLE = 010	/* Disable output--overrides all other bits. */
-  };
-
 void settings_init (void);
 void settings_done (void);
 
@@ -45,11 +36,6 @@ void set_viewwidth (int);
 bool get_safer_mode (void);
 void set_safer_mode (void);
 
-char get_decimal (void);
-void set_decimal (char);
-char get_grouping (void);
-void set_grouping (char);
-
 bool get_echo (void);
 void set_echo (bool);
 bool get_include (void);
@@ -61,6 +47,11 @@ void set_epoch (int);
 bool get_errorbreak (void);
 void set_errorbreak (bool);
 
+bool get_error_routing_to_terminal (void);
+void set_error_routing_to_terminal (bool);
+bool get_error_routing_to_listing (void);
+void set_error_routing_to_listing (bool);
+
 bool get_scompression (void);
 void set_scompression (bool);
 
@@ -94,24 +85,6 @@ void set_workspace (size_t);
 const struct fmt_spec *get_format (void);
 void set_format (const struct fmt_spec *);
 
-/* Maximum number of custom currency specifications */
-#define CC_CNT 5
-
-/* One custom currency specification. */
-#define CC_WIDTH 16
-struct custom_currency
-  {
-    char neg_prefix[CC_WIDTH];	/* Negative prefix. */
-    char prefix[CC_WIDTH];	/* Prefix. */
-    char suffix[CC_WIDTH];	/* Suffix. */
-    char neg_suffix[CC_WIDTH];	/* Negative suffix. */
-    char decimal;		/* Decimal point. */
-    char grouping;		/* Grouping character. */
-  };
-
-const struct custom_currency *get_cc (int idx);
-void set_cc (int idx, const struct custom_currency *);
-
 bool get_testing_mode (void);
 void set_testing_mode (bool);