From 1a1ef4d0d39d40792fa65738186107f2e0fc507a Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Sun, 28 Jun 2015 10:41:49 +0200 Subject: [PATCH] Fix MODVAR stuff on Windows. Fixes a crash. --- include/h.h | 4 ++-- src/extcmodes.c | 2 +- src/ircd.c | 2 +- src/win32/service.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/h.h b/include/h.h index 5959d230b..9563772ec 100644 --- a/include/h.h +++ b/include/h.h @@ -711,7 +711,7 @@ extern char *unreal_time_synch_error(void); extern int unreal_time_synch(int timeout); extern int extban_is_banned_helper(char *buf); extern char *getcloak(aClient *sptr); -extern unsigned char param_to_slot_mapping[256]; +extern MODVAR unsigned char param_to_slot_mapping[256]; extern char *cm_getparameter(aChannel *chptr, char mode); extern void cm_putparameter(aChannel *chptr, char mode, char *str); extern void cm_freeparameter(aChannel *chptr, char mode); @@ -753,6 +753,6 @@ extern char *our_strcasestr(char *haystack, char *needle); extern void update_conf(void); extern MODVAR int need_34_upgrade; #ifdef _WIN32 -extern BOOL IsService; +extern MODVAR BOOL IsService; #endif extern int match_ip46(char *a, char *b); diff --git a/src/extcmodes.c b/src/extcmodes.c index 34fc93c66..e23403a67 100644 --- a/src/extcmodes.c +++ b/src/extcmodes.c @@ -45,7 +45,7 @@ extern char cmodestring[512]; /* Channel parameter to slot# mapping */ -unsigned char param_to_slot_mapping[256]; +MODVAR unsigned char param_to_slot_mapping[256]; extern void make_cmodestr(void); diff --git a/src/ircd.c b/src/ircd.c index 72d143382..9e948d22b 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -104,7 +104,7 @@ extern SERVICE_STATUS_HANDLE IRCDStatusHandle; extern SERVICE_STATUS IRCDStatus; #endif -unsigned char conf_debuglevel = 0; +MODVAR unsigned char conf_debuglevel = 0; #ifdef USE_LIBCURL extern void url_init(void); diff --git a/src/win32/service.c b/src/win32/service.c index 8adafd32a..bfb739573 100644 --- a/src/win32/service.c +++ b/src/win32/service.c @@ -33,7 +33,7 @@ SERVICE_STATUS_HANDLE IRCDStatusHandle; /* Signal to rehash */ #define IRCD_SERVICE_CONTROL_REHASH 128 -BOOL IsService = FALSE; +MODVAR BOOL IsService = FALSE; extern OSVERSIONINFO VerInfo; #define WIN32_VERSION BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH5