Eliminate temp_case, and a few other cleanups.

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

diff --git a/src/glob.c b/src/glob.c
index 958edc5f221f34ab36e3a8b7a64a7b2f5e985db6..60da1fffd3b2e54e2a6995de86fafcc833b14c01 100644 (file)
--- a/src/glob.c
+++ b/src/glob.c
@@ -62,7 +62,7 @@ extern void stifle_history ();
 
 #if __DJGPP__
 #include <conio.h>
-#elif __WIN32__ && __BORLANDC__
+#elif defined (__WIN32__) && defined (__BORLANDC__)
 #undef gettext
 #include <conio.h>
 #define gettext(STRING)                                \
@@ -100,8 +100,6 @@ extern void stifle_history ();
 struct dictionary *default_dict;
 struct expression *process_if_expr;
 
-struct ccase *temp_case;
-
 struct trns_header **t_trns;
 int n_trns;
 int m_trns;
@@ -111,9 +109,6 @@ int FILTER_before_TEMPORARY;
 
 struct file_handle *default_handle;
 
-void (*read_active_file) (void);
-void (*cancel_input_pgm) (void);
-
 struct ctl_stmt *ctl_stack;
 
 /* log.h */
@@ -130,11 +125,11 @@ static char term_buffer[16384];
 #endif
 
 void
-init_glob (int argc unused, char **argv)
+init_glob (int argc UNUSED, char **argv)
 {
   /* FIXME: Allow i18n of other locale items (besides LC_MESSAGES). */
 #if ENABLE_NLS
-#if LC_MESSAGE
+#if HAVE_LC_MESSAGES
   setlocale (LC_MESSAGES, "");
 #endif
   setlocale (LC_MONETARY, "");
@@ -169,11 +164,6 @@ init_glob (int argc unused, char **argv)
   /* var.h */
   default_dict = dict_create ();
 
-  vec_init (&reinit_sysmis);
-  vec_init (&reinit_blanks);
-  vec_init (&init_zero);
-  vec_init (&init_blanks);
-
   last_vfm_invocation = time (NULL);
 
   /* lexer.h */
@@ -258,7 +248,7 @@ init_glob (int argc unused, char **argv)
   set_nullline = 1;
   set_more = 1;
   set_prompt = xstrdup ("PSPP> ");
-  set_seed = 2000000;
+  set_seed = NOT_LONG;
 
 #if __DJGPP__ || __BORLANDC__
   {