aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2014-11-11 01:13:14 -0500
committerJustin M. Keyes <justinkz@gmail.com>2014-11-11 01:13:14 -0500
commite450c541ddfe1266d3d56b594f83ab197e747584 (patch)
tree9ef184560672181e0fb75d7271144b48a0a30c27
parent85842b29eb9f525ee78c153713e9f55e503d82b7 (diff)
parent05c1394fcd77f111b8edf11e96356c457d2b5c3a (diff)
downloadrneovim-e450c541ddfe1266d3d56b594f83ab197e747584.tar.gz
rneovim-e450c541ddfe1266d3d56b594f83ab197e747584.tar.bz2
rneovim-e450c541ddfe1266d3d56b594f83ab197e747584.zip
Merge pull request #1439 from jszakmeister/shuffle-some-includes
Move many includes down to the EXITFREE block.
-rw-r--r--src/nvim/memory.c59
1 files changed, 30 insertions, 29 deletions
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index 0e7f8a9071..c2c406a235 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -8,41 +8,12 @@
#include "nvim/vim.h"
#include "nvim/misc2.h"
-#include "nvim/file_search.h"
-#include "nvim/buffer.h"
-#include "nvim/charset.h"
-#include "nvim/diff.h"
-#include "nvim/edit.h"
#include "nvim/eval.h"
-#include "nvim/ex_cmds.h"
-#include "nvim/ex_docmd.h"
-#include "nvim/ex_getln.h"
-#include "nvim/fileio.h"
-#include "nvim/fold.h"
-#include "nvim/getchar.h"
-#include "nvim/mark.h"
-#include "nvim/mbyte.h"
#include "nvim/memfile.h"
-#include "nvim/memline.h"
#include "nvim/memory.h"
#include "nvim/message.h"
#include "nvim/misc1.h"
-#include "nvim/move.h"
-#include "nvim/option.h"
-#include "nvim/ops.h"
-#include "nvim/os_unix.h"
-#include "nvim/path.h"
-#include "nvim/quickfix.h"
-#include "nvim/regexp.h"
-#include "nvim/screen.h"
-#include "nvim/search.h"
-#include "nvim/spell.h"
-#include "nvim/syntax.h"
-#include "nvim/tag.h"
#include "nvim/term.h"
-#include "nvim/ui.h"
-#include "nvim/window.h"
-#include "nvim/os/os.h"
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "memory.c.generated.h"
@@ -430,6 +401,36 @@ void do_outofmem_msg(size_t size)
#if defined(EXITFREE) || defined(PROTO)
+#include "nvim/file_search.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/edit.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_getln.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/move.h"
+#include "nvim/option.h"
+#include "nvim/ops.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/quickfix.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/spell.h"
+#include "nvim/syntax.h"
+#include "nvim/tag.h"
+#include "nvim/ui.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
+
/*
* Free everything that we allocated.
* Can be used to detect memory leaks, e.g., with ccmalloc.