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().
This commit is contained in:
Kevin Easton
2017-05-10 23:19:57 +10:00
parent 7173175adc
commit a329dd8404
3 changed files with 7 additions and 6 deletions

View File

@@ -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_
enum VAR_TYPES { unused };
#endif
int get_int_var (enum VAR_TYPES);
void ircpanic (char *, ...);
#define get_int_var(v) BX_get_int_var(v)
#define ircpanic BX_ircpanic
char *my_ltoa (long);
#else