[Forensics-changes] [yara] 219/407: Fix issues when using dmalloc

[Hilko Bengen]

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

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

commit aff604db839d5c7937e584f4f8229ee188693a98
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Thu Nov 20 18:42:04 2014 +0100

    Fix issues when using dmalloc
---
 libyara/include/yara/mem.h | 1 +
 libyara/libyara.c          | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libyara/include/yara/mem.h b/libyara/include/yara/mem.h
index 540131b..d794f44 100644
--- a/libyara/include/yara/mem.h
+++ b/libyara/include/yara/mem.h
@@ -24,6 +24,7 @@ limitations under the License.
 #ifdef DMALLOC
 
 #define yr_malloc malloc
+#define yr_calloc calloc
 #define yr_realloc realloc
 #define yr_free free
 #define yr_strdup strdup
diff --git a/libyara/libyara.c b/libyara/libyara.c
index 82aa447..6d20ad0 100644
--- a/libyara/libyara.c
+++ b/libyara/libyara.c
@@ -19,10 +19,9 @@ limitations under the License.
 #include <ctype.h>
 
 #include <yara/error.h>
-#include <yara/mem.h>
 #include <yara/re.h>
 #include <yara/modules.h>
-
+#include <yara/mem.h>
 
 #ifdef _WIN32
 #define snprintf _snprintf

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