aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNicolas Hillegeer <nicolas@hillegeer.com>2014-07-12 19:35:57 +0200
committerNicolas Hillegeer <nicolas@hillegeer.com>2014-07-16 19:05:35 +0200
commit32ddfec84f9335673e38b31950544a24304697f8 (patch)
tree474403e1325e6bd6c54b31bf2b32128024771522 /src
parent1710fa43376f4844abe056b3f87aece1845ff89a (diff)
downloadrneovim-32ddfec84f9335673e38b31950544a24304697f8.tar.gz
rneovim-32ddfec84f9335673e38b31950544a24304697f8.tar.bz2
rneovim-32ddfec84f9335673e38b31950544a24304697f8.zip
memory.h: don't include vim.h in header files
Also include stdint.h in khash.h. It was transitively included by vim.h via memory.h before. khash.h accidentally relied on that.
Diffstat (limited to 'src')
-rw-r--r--src/nvim/lib/khash.h1
-rw-r--r--src/nvim/memory.h3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/lib/khash.h b/src/nvim/lib/khash.h
index f706e994d5..c9198e048c 100644
--- a/src/nvim/lib/khash.h
+++ b/src/nvim/lib/khash.h
@@ -128,6 +128,7 @@ int main() {
#include <stdlib.h>
#include <string.h>
#include <limits.h>
+#include <stdint.h>
#include "nvim/memory.h"
diff --git a/src/nvim/memory.h b/src/nvim/memory.h
index 3a05797e89..4ff31ff732 100644
--- a/src/nvim/memory.h
+++ b/src/nvim/memory.h
@@ -1,8 +1,7 @@
#ifndef NVIM_MEMORY_H
#define NVIM_MEMORY_H
-#include <stddef.h>
-#include "nvim/vim.h"
+#include <stddef.h> // for size_t
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "memory.h.generated.h"