From bf32e1e27a75459821bb41285517f245875260ba Mon Sep 17 00:00:00 2001 From: plusvic Date: Tue, 22 Nov 2016 18:35:37 +0100 Subject: [PATCH] Fix issue #564 --- libyara/include/yara/modules.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libyara/include/yara/modules.h b/libyara/include/yara/modules.h index 9e9a6e3e3b..665f9d0e18 100644 --- a/libyara/include/yara/modules.h +++ b/libyara/include/yara/modules.h @@ -45,15 +45,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Concatenation that macro-expands its arguments. -#define CONCAT(arg1, arg2) _CONCAT(arg1, arg2) // expands the arguments. -#define _CONCAT(arg1, arg2) arg1 ## arg2 // do the actual concatenation. +#define YR_CONCAT(arg1, arg2) _YR_CONCAT(arg1, arg2) // expands the arguments. +#define _YR_CONCAT(arg1, arg2) arg1 ## arg2 // do the actual concatenation. -#define module_declarations CONCAT(MODULE_NAME, __declarations) -#define module_load CONCAT(MODULE_NAME, __load) -#define module_unload CONCAT(MODULE_NAME, __unload) -#define module_initialize CONCAT(MODULE_NAME, __initialize) -#define module_finalize CONCAT(MODULE_NAME, __finalize) +#define module_declarations YR_CONCAT(MODULE_NAME, __declarations) +#define module_load YR_CONCAT(MODULE_NAME, __load) +#define module_unload YR_CONCAT(MODULE_NAME, __unload) +#define module_initialize YR_CONCAT(MODULE_NAME, __initialize) +#define module_finalize YR_CONCAT(MODULE_NAME, __finalize) #define begin_declarations \ int module_declarations(YR_OBJECT* module) { \