From 32ddfec84f9335673e38b31950544a24304697f8 Mon Sep 17 00:00:00 2001
From: Nicolas Hillegeer <nicolas@hillegeer.com>
Date: Sat, 12 Jul 2014 19:35:57 +0200
Subject: 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.
---
 src/nvim/lib/khash.h | 1 +
 src/nvim/memory.h    | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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"
-- 
cgit