summaryrefslogtreecommitdiff
path: root/mysys/my_context.c
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-11-05 15:16:37 +0100
committerSergei Golubchik <serg@mariadb.org>2015-11-23 16:02:56 +0100
commit65d69c84cffa42f4766940899972c008616f2942 (patch)
tree5d93e23dadf34befa3085159a8fd2bfd9421a947 /mysys/my_context.c
parente4b88235b51966855a4973fd551123cb02fac0c9 (diff)
downloadmariadb-git-65d69c84cffa42f4766940899972c008616f2942.tar.gz
cmake: remove unused checks, options, and symbols
Diffstat (limited to 'mysys/my_context.c')
-rw-r--r--mysys/my_context.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/mysys/my_context.c b/mysys/my_context.c
index 60c0014b3b9..5faa041361a 100644
--- a/mysys/my_context.c
+++ b/mysys/my_context.c
@@ -24,7 +24,7 @@
#include "m_string.h"
#include "my_context.h"
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/valgrind.h>
#endif
@@ -134,7 +134,7 @@ my_context_init(struct my_context *c, size_t stack_size)
if (!(c->stack= malloc(stack_size)))
return -1; /* Out of memory */
c->stack_size= stack_size;
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
c->valgrind_stack_id=
VALGRIND_STACK_REGISTER(c->stack, ((unsigned char *)(c->stack))+stack_size);
#endif
@@ -146,7 +146,7 @@ my_context_destroy(struct my_context *c)
{
if (c->stack)
{
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id);
#endif
free(c->stack);
@@ -384,7 +384,7 @@ my_context_init(struct my_context *c, size_t stack_size)
(( ((intptr)c->stack_bot + stack_size) & ~(intptr)0xf) - 16);
bzero(c->stack_top, 16);
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
c->valgrind_stack_id=
VALGRIND_STACK_REGISTER(c->stack_bot, c->stack_top);
#endif
@@ -397,7 +397,7 @@ my_context_destroy(struct my_context *c)
if (c->stack_bot)
{
free(c->stack_bot);
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id);
#endif
}
@@ -620,7 +620,7 @@ my_context_init(struct my_context *c, size_t stack_size)
(( ((intptr)c->stack_bot + stack_size) & ~(intptr)0xf) - 16);
bzero(c->stack_top, 16);
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
c->valgrind_stack_id=
VALGRIND_STACK_REGISTER(c->stack_bot, c->stack_top);
#endif
@@ -633,7 +633,7 @@ my_context_destroy(struct my_context *c)
if (c->stack_bot)
{
free(c->stack_bot);
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id);
#endif
}