From 7a741b467c1e178ba721550ec62fecd2d4afbf90 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 18 Sep 2013 20:01:08 -0400 Subject: [PATCH] Add padding to struct memo for non mysql builds to keep abi compat with mysql builds --- include/services.h | 2 ++ version.log | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/services.h b/include/services.h index c7e03fe57..7c770aa95 100644 --- a/include/services.h +++ b/include/services.h @@ -496,6 +496,8 @@ struct memo_ { ModuleData *moduleData; /* Module saved data attached to the Memo */ #ifdef USE_MYSQL uint32 id; /* Database ID; see mysql.c */ +#else + uint32 notused; /* ABI compat with no mysql */ #endif }; diff --git a/version.log b/version.log index fe199955a..c908d161c 100644 --- a/version.log +++ b/version.log @@ -8,7 +8,7 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="9" VERSION_EXTRA="-git" -VERSION_BUILD="3125" +VERSION_BUILD="3126" # Changes since 1.8.8 Release #Revision 3125 - Fix kick reason in cs_suspend and cs_forbid if no reason is given