Include vars.h in wserv.c and scr-bx.c for enum VAR_TYPES

Also define STERM_C and include modval.h in scr-bx.c.

This allows us to remove the slightly bogus dummy definition of enum VAR_TYPES from modval.h, and use a simple
macro to redirect the declaration and use of get_int_var() to BX_get_int_var().

include/modval.h

@@ -39,11 +39,8 @@
 #define ip_to_host(x) BX_ip_to_host(x)
 #define host_to_ip(x) BX_host_to_ip(x)
 #define connect_by_number(a, b, c, d, e) BX_connect_by_number(a, b, c, d, e)
-#ifndef __vars_h_
+#define get_int_var(v) BX_get_int_var(v)
-enum VAR_TYPES { unused };
+#define ircpanic BX_ircpanic
-#endif
-int  get_int_var (enum VAR_TYPES);
-void ircpanic (char *, ...);
 char *my_ltoa (long);
 #else
 

source/scr-bx.c

@@ -25,6 +25,9 @@
 #include "ircterm.h"
 #include "screen.h"
 #include "ircaux.h"
+#include "vars.h"
+#define STERM_C
+#include "modval.h"
 
 #include <sys/ioctl.h>
 
@@ -90,7 +93,7 @@ void ircpanic(char *string, ...)
 	return;
 }
 
-int get_int_var(int var)
+int get_int_var(enum VAR_TYPES var)
 {
 	return 1;
 }

source/wserv.c

@@ -22,6 +22,7 @@ static	char	rcsid[] = "@(#)$Id$";
 
 #include "ircterm.h"
 #include "ircaux.h"
+#include "vars.h"
 #define WTERM_C
 #include "modval.h"
 #include <errno.h>