Beginning of VFM cleanup.

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

diff --git a/src/glob.c b/src/glob.c
index ca71e9e8063265a7842825bb2842eb5095d4e265..5bf5600f25189eb2be5d7c5b9c5e62e4ad06d02b 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)                                \
@@ -111,9 +111,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 +127,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 +166,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 */