From 5a2d6f4308798f5917ccfbc8dd95d7f067a90384 Mon Sep 17 00:00:00 2001
From: Ruben Ayrapetyan <r.ayrapetyan@samsung.com>
Date: Thu, 5 Feb 2015 17:58:55 +0300
Subject: [PATCH] Replacing JERRY_NVALGRIND with the opposite JERRY_VALGRIND.

---
 Makefile.mk                 | 2 +-
 src/liballocator/mem-heap.c | 6 +++---
 src/liballocator/mem-pool.c | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile.mk b/Makefile.mk
index 5f0cd9fcd..813810aa3 100644
--- a/Makefile.mk
+++ b/Makefile.mk
@@ -394,9 +394,9 @@ endif
 ifeq ($(OPTION_VALGRIND),enable)
  VALGRIND_CMD := "valgrind --error-exitcode=254 --track-origins=yes"
  VALGRIND_TIMEOUT := 60
+ DEFINES_JERRY += -DJERRY_VALGRIND
 else
  VALGRIND_CMD :=
- DEFINES_JERRY += -DJERRY_NVALGRIND
  VALGRIND_TIMEOUT :=
 endif
 
diff --git a/src/liballocator/mem-heap.c b/src/liballocator/mem-heap.c
index c13cb5b66..2e6244b53 100644
--- a/src/liballocator/mem-heap.c
+++ b/src/liballocator/mem-heap.c
@@ -37,7 +37,7 @@
 /*
  * Valgrind-related options and headers
  */
-#ifndef JERRY_NVALGRIND
+#ifdef JERRY_VALGRIND
 # include "memcheck.h"
 
 # define VALGRIND_NOACCESS_STRUCT(s)    (void)VALGRIND_MAKE_MEM_NOACCESS((s), sizeof (*(s)))
@@ -46,14 +46,14 @@
 # define VALGRIND_NOACCESS_SPACE(p, s)  (void)VALGRIND_MAKE_MEM_NOACCESS((p), (s))
 # define VALGRIND_UNDEFINED_SPACE(p, s) (void)VALGRIND_MAKE_MEM_UNDEFINED((p), (s))
 # define VALGRIND_DEFINED_SPACE(p, s)   (void)VALGRIND_MAKE_MEM_DEFINED((p), (s))
-#else /* !JERRRY_NVALGRIND */
+#else /* JERRY_VALGRIND */
 # define VALGRIND_NOACCESS_STRUCT(s)
 # define VALGRIND_UNDEFINED_STRUCT(s)
 # define VALGRIND_DEFINED_STRUCT(s)
 # define VALGRIND_NOACCESS_SPACE(p, s)
 # define VALGRIND_UNDEFINED_SPACE(p, s)
 # define VALGRIND_DEFINED_SPACE(p, s)
-#endif /* !JERRY_NVALGRIND */
+#endif /* JERRY_VALGRIND */
 
 /**
  * Magic numbers for heap memory blocks
diff --git a/src/liballocator/mem-pool.c b/src/liballocator/mem-pool.c
index 297f04292..09d127582 100644
--- a/src/liballocator/mem-pool.c
+++ b/src/liballocator/mem-pool.c
@@ -34,17 +34,17 @@
 /*
  * Valgrind-related options and headers
  */
-#ifndef JERRY_NVALGRIND
+#ifdef JERRY_VALGRIND
 # include "memcheck.h"
 
 # define VALGRIND_NOACCESS_SPACE(p, s)  (void)VALGRIND_MAKE_MEM_NOACCESS((p), (s))
 # define VALGRIND_UNDEFINED_SPACE(p, s) (void)VALGRIND_MAKE_MEM_UNDEFINED((p), (s))
 # define VALGRIND_DEFINED_SPACE(p, s)   (void)VALGRIND_MAKE_MEM_DEFINED((p), (s))
-#else /* !JERRRY_NVALGRIND */
+#else /* JERRY_VALGRIND */
 # define VALGRIND_NOACCESS_SPACE(p, s)
 # define VALGRIND_UNDEFINED_SPACE(p, s)
 # define VALGRIND_DEFINED_SPACE(p, s)
-#endif /* !JERRY_NVALGRIND */
+#endif /* JERRY_VALGRIND */
 
 static void mem_check_pool (mem_pool_state_t *pool_p);