[Forensics-changes] [yara] 76/192: Fix issue #564

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.6.0
in repository yara.

commit bf32e1e27a75459821bb41285517f245875260ba
Author: plusvic <plusvic at gmail.com>
Date:   Tue Nov 22 18:35:37 2016 +0100

    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 9e9a6e3..665f9d0 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) { \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git