Commit 117eacc0 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

get the lock_tree tests to compile and run on the main trunk. closes #1384

git-svn-id: file:///svn/toku/tokudb@8735 c7de825b-a66e-492c-adef-691d508d4ae1
parent bef2a4c0
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.DEFAULT_GOAL= build .DEFAULT_GOAL= build
TOKUROOT=../../../ TOKUROOT=../../../
INCLUDEDIRS=-I. -I../ -I$(TOKUROOT)newbrt -I$(TOKUROOT)src/range_tree INCLUDEDIRS=-I. -I../ -I$(TOKUROOT)newbrt -I$(TOKUROOT)src/range_tree -I$(TOKUROOT)include
DEPEND_COMPILE += \ DEPEND_COMPILE += \
../*.h \ ../*.h \
test.h \ test.h \
......
...@@ -118,5 +118,5 @@ static inline void* fail_malloc(size_t size) { ...@@ -118,5 +118,5 @@ static inline void* fail_malloc(size_t size) {
errno = ENOMEM; errno = ENOMEM;
return NULL; return NULL;
} }
return malloc(size); return toku_malloc(size);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment