diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2014-03-07 11:58:06 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-03-07 11:58:06 -0300 |
| commit | 2f1a2eb0f20a1a4f8ffd464e52e2c8f1860bb167 (patch) | |
| tree | 803d54256a13a89f0a5f3ec579169e59d112d963 | |
| parent | 0412ee7440da718a27425fa1559855f3d363549f (diff) | |
| download | rneovim-2f1a2eb0f20a1a4f8ffd464e52e2c8f1860bb167.tar.gz rneovim-2f1a2eb0f20a1a4f8ffd464e52e2c8f1860bb167.tar.bz2 rneovim-2f1a2eb0f20a1a4f8ffd464e52e2c8f1860bb167.zip | |
Fix `free_all_mem` and EXITFREE definition
Because of the '$' in `if(DEFINED $ENV{VALGRIND_CHECK})` EXITFREE wasn't being
defined, so the `free_all_mem` wasn't being included or called in the resulting
binary.
This commit fixes that, and also adds includes needed for `free_all_mem`
compilation.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/misc2.c | 11 | ||||
| -rw-r--r-- | src/testdir/Makefile | 2 |
4 files changed, 15 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 0eec0c8b96..03ced918a5 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ /src/testdir/tiny.vim /src/testdir/test*.out /src/testdir/test.log +/src/testdir/viminfo /src/testdir/test.ok /src/testdir/*.failed /src/testdir/X* diff --git a/CMakeLists.txt b/CMakeLists.txt index 065a5b09bc..c2a2b71915 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,8 @@ else() set(DEBUG 0) endif() -if(DEFINED $ENV{VALGRIND_CHECK}) +if(DEFINED ENV{VALGRIND_CHECK}) + message(STATUS "Defining EXITFREE for valgrind checks") add_definitions(-DEXITFREE) endif() diff --git a/src/misc2.c b/src/misc2.c index 92a6af598b..0fce70759d 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -14,13 +14,18 @@ #include "misc2.h" #include "file_search.h" #include "blowfish.h" +#include "buffer.h" #include "charset.h" +#include "diff.h" #include "edit.h" #include "eval.h" +#include "ex_cmds.h" #include "ex_docmd.h" #include "ex_getln.h" #include "fileio.h" #include "fold.h" +#include "getchar.h" +#include "mark.h" #include "mbyte.h" #include "memfile.h" #include "memline.h" @@ -28,8 +33,14 @@ #include "misc1.h" #include "move.h" #include "option.h" +#include "ops.h" #include "os_unix.h" +#include "quickfix.h" +#include "regexp.h" #include "screen.h" +#include "search.h" +#include "spell.h" +#include "syntax.h" #include "tag.h" #include "term.h" #include "ui.h" diff --git a/src/testdir/Makefile b/src/testdir/Makefile index be4fc279ab..5477194300 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -79,7 +79,7 @@ test1.out: test1.in # 200 msec is sufficient, but only modern sleep supports a fraction of # a second, fall back to a second if it fails. @-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1" - -$(RUN_VIM) $*.in + $(RUN_VIM) $*.in # For flaky tests retry one time. @/bin/sh -c "if test -f test.out -a $* = test61; then \ |