From 300668dce8699accfb3e8cbce6db55b937230bb7 Mon Sep 17 00:00:00 2001 From: Haru Date: Wed, 2 Dec 2015 11:54:36 +0100 Subject: Fixed compile errors on very old PACKETVERs - Fixes #903 and other similar problems Signed-off-by: Haru --- src/common/cbasetypes.h | 3 +++ src/common/console.h | 8 ++++---- src/common/mmo.h | 6 ++++-- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'src/common') diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h index 64f21f7e0..5fc08b770 100644 --- a/src/common/cbasetypes.h +++ b/src/common/cbasetypes.h @@ -428,4 +428,7 @@ typedef char bool; #define ZEROED_BLOCK_POS(x) (&(x)->HERC__zeroed_block_BEGIN) #define ZEROED_BLOCK_SIZE(x) ((char*)&((x)->HERC__zeroed_block_END) - (char*)&((x)->HERC__zeroed_block_BEGIN) + sizeof((x)->HERC__zeroed_block_END)) +/** Support macros for marking structs as unavailable */ +#define UNAVAILABLE_STRUCT int8 HERC__unavailable_struct + #endif /* COMMON_CBASETYPES_H */ diff --git a/src/common/console.h b/src/common/console.h index ef6db0cb4..102a1beaf 100644 --- a/src/common/console.h +++ b/src/common/console.h @@ -50,8 +50,8 @@ struct CParseEntry { } u; }; -#ifdef CONSOLE_INPUT struct console_input_interface { +#ifdef CONSOLE_INPUT /* vars */ SPIN_LOCK ptlock;/* parse thread lock */ rAthread *pthread;/* parse thread */ @@ -75,10 +75,10 @@ struct console_input_interface { void (*parse_list_subs) (struct CParseEntry *cmd, unsigned char depth); void (*addCommand) (char *name, CParseFunc func); void (*setSQL) (Sql *SQL_handle); -}; -#else -struct console_input_interface; +#else // not CONSOLE_INPUT + UNAVAILABLE_STRUCT; #endif +}; struct console_interface { void (*init) (void); diff --git a/src/common/mmo.h b/src/common/mmo.h index 73d4510a1..095b96341 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -462,13 +462,15 @@ struct s_friend { char name[NAME_LENGTH]; }; -#ifdef HOTKEY_SAVING struct hotkey { +#ifdef HOTKEY_SAVING unsigned int id; unsigned short lv; unsigned char type; // 0: item, 1: skill -}; +#else // not HOTKEY_SAVING + UNAVAILABLE_STRUCT; #endif +}; struct mmo_charstatus { int char_id; -- cgit v1.2.3-60-g2f50