From e731a5edf879cd0b5eb2a2035f78e2b44fbe75f5 Mon Sep 17 00:00:00 2001
From: Eliseo Martínez <eliseomarmol@gmail.com>
Date: Wed, 14 May 2014 18:05:03 +0200
Subject: Introduce nvim namespace: Fix relative includes.

Problem:  Some newly introduced files used includes relative to the
          current file, both of the form `include "../XXX.h"` and
          `include "XXX.h"`.
          Preferred form is relative to include root (src/ in our case).
Solution: Change includes to preferred form.
Note:     This is also done to ease next commit (prepend 'nvim/ to all
          project-local includes).
---
 src/nvim/api/buffer.c     | 6 +++---
 src/nvim/api/helpers.c    | 6 +++---
 src/nvim/api/helpers.h    | 2 +-
 src/nvim/api/vim.c        | 6 +++---
 src/nvim/api/window.c     | 4 ++--
 src/nvim/os/msgpack_rpc.c | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index 328b26061d..c32e861a04 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -6,8 +6,8 @@
 #include "api/buffer.h"
 #include "api/helpers.h"
 #include "api/defs.h"
-#include "../vim.h"
-#include "../buffer.h"
+#include "vim.h"
+#include "buffer.h"
 #include "memline.h"
 #include "memory.h"
 #include "misc1.h"
@@ -16,7 +16,7 @@
 #include "mark.h"
 #include "fileio.h"
 #include "move.h"
-#include "../window.h"
+#include "window.h"
 #include "undo.h"
 
 // Find a window that contains "buf" and switch to it.
diff --git a/src/nvim/api/helpers.c b/src/nvim/api/helpers.c
index 51b1dcb754..8d77ebfeea 100644
--- a/src/nvim/api/helpers.c
+++ b/src/nvim/api/helpers.c
@@ -4,9 +4,9 @@
 
 #include "api/helpers.h"
 #include "api/defs.h"
-#include "../vim.h"
-#include "../buffer.h"
-#include "../window.h"
+#include "vim.h"
+#include "buffer.h"
+#include "window.h"
 #include "memory.h"
 #include "eval.h"
 #include "option.h"
diff --git a/src/nvim/api/helpers.h b/src/nvim/api/helpers.h
index afa16e54f4..53538a8e28 100644
--- a/src/nvim/api/helpers.h
+++ b/src/nvim/api/helpers.h
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 
 #include "api/defs.h"
-#include "../vim.h"
+#include "vim.h"
 
 #define set_api_error(message, err)                \
   do {                                             \
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index f9fa21550e..4cf1815f83 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -7,9 +7,9 @@
 #include "api/helpers.h"
 #include "api/defs.h"
 #include "api/buffer.h"
-#include "../vim.h"
-#include "../buffer.h"
-#include "../window.h"
+#include "vim.h"
+#include "buffer.h"
+#include "window.h"
 #include "types.h"
 #include "ascii.h"
 #include "ex_docmd.h"
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index 2c67fc2a74..2653a9b6af 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -5,8 +5,8 @@
 #include "api/window.h"
 #include "api/defs.h"
 #include "api/helpers.h"
-#include "../vim.h"
-#include "../window.h"
+#include "vim.h"
+#include "window.h"
 #include "screen.h"
 #include "misc2.h"
 
diff --git a/src/nvim/os/msgpack_rpc.c b/src/nvim/os/msgpack_rpc.c
index e429bf0519..45c0b3aa21 100644
--- a/src/nvim/os/msgpack_rpc.c
+++ b/src/nvim/os/msgpack_rpc.c
@@ -1,6 +1,6 @@
 #include <msgpack.h>
 
-#include "msgpack_rpc.h"
+#include "os/msgpack_rpc.h"
 #include "vim.h"
 #include "memory.h"
 
-- 
cgit