Separate random numbers from other settings because of GSL dependency.

[pspp-builds.git] / src / glob.c

diff --git a/src/glob.c b/src/glob.c
index 1b5de09955e0bc4ee2611c4fda74e2d1c5cbe5f0..38dd32373801a0be277d9137fefb81778979d0a5 100644 (file)
--- a/src/glob.c
+++ b/src/glob.c
@@ -63,7 +63,6 @@ extern void stifle_history ();
 #include "calendar.h"
 #include "command.h"
 #include "dictionary.h"
-#include "do-ifP.h"
 #include "error.h"
 #include "file-handle.h"
 #include "filename.h"
@@ -72,6 +71,7 @@ extern void stifle_history ();
 #include "lexer.h"
 #include "magic.h"
 #include "main.h"
+#include "random.h"
 #include "settings.h"
 #include "str.h"
 #include "var.h"
@@ -84,19 +84,13 @@ extern void stifle_history ();
 struct dictionary *default_dict;
 struct expression *process_if_expr;
 
-struct trns_header **t_trns;
-int n_trns;
-int m_trns;
-int f_trns;
-
-short test_mode=0;
+struct transformation *t_trns;
+size_t n_trns, m_trns, f_trns;
 
 int FILTER_before_TEMPORARY;
 
 struct file_handle *default_handle;
 
-struct ctl_stmt *ctl_stack;
-
 /* log.h */
 char *logfn;
 FILE *logfile;
@@ -167,7 +161,8 @@ init_glob (int argc UNUSED, char **argv)
   }
 
 
-  init_settings();
+  init_settings ();
+  random_init ();
 
   /* log.h */
   logging = 1;
@@ -183,6 +178,7 @@ done_glob(void)
   cancel_transformations ();
   dict_destroy (default_dict);
   free (logfn);
+  random_done ();
   done_settings ();
   ds_destroy (&tokstr);