From 1710fa43376f4844abe056b3f87aece1845ff89a Mon Sep 17 00:00:00 2001
From: Nicolas Hillegeer <nicolas@hillegeer.com>
Date: Sat, 12 Jul 2014 19:16:41 +0200
Subject: vim: move vim_acl_T to types.h

Also include "types.h" in os_unix.h because it declares functions that
return vim_acl_T.
---
 src/nvim/fileio.c  | 1 +
 src/nvim/os_unix.c | 1 +
 src/nvim/os_unix.h | 1 +
 src/nvim/types.h   | 3 +++
 src/nvim/undo.c    | 1 +
 src/nvim/vim.h     | 2 --
 6 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index c867211a66..9b5df80a0c 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -51,6 +51,7 @@
 #include "nvim/strings.h"
 #include "nvim/tempfile.h"
 #include "nvim/term.h"
+#include "nvim/types.h"
 #include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/window.h"
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index 4a0fbf5c18..9e7940bc2a 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -54,6 +54,7 @@
 #include "nvim/syntax.h"
 #include "nvim/tempfile.h"
 #include "nvim/term.h"
+#include "nvim/types.h"
 #include "nvim/ui.h"
 #include "nvim/os/os.h"
 #include "nvim/os/time.h"
diff --git a/src/nvim/os_unix.h b/src/nvim/os_unix.h
index 5610fe68eb..5a3eb84ba4 100644
--- a/src/nvim/os_unix.h
+++ b/src/nvim/os_unix.h
@@ -1,6 +1,7 @@
 #ifndef NVIM_OS_UNIX_H
 #define NVIM_OS_UNIX_H
 
+#include "nvim/types.h"  // for vim_acl_T
 #include "nvim/os/shell.h"
 
 /* Values returned by mch_nodetype() */
diff --git a/src/nvim/types.h b/src/nvim/types.h
index a3c4509756..ad905aa95b 100644
--- a/src/nvim/types.h
+++ b/src/nvim/types.h
@@ -10,6 +10,9 @@
 
 #include <stdint.h>
 
+// dummy to pass an ACL to a function
+typedef void *vim_acl_T;
+
 // Make sure long_u is big enough to hold a pointer.
 // On Win64, longs are 32 bits and pointers are 64 bits.
 // For printf() and scanf(), we need to take care of long_u specifically.
diff --git a/src/nvim/undo.c b/src/nvim/undo.c
index b9f3309cef..96b83a3e2d 100644
--- a/src/nvim/undo.c
+++ b/src/nvim/undo.c
@@ -107,6 +107,7 @@
 #include "nvim/screen.h"
 #include "nvim/sha256.h"
 #include "nvim/strings.h"
+#include "nvim/types.h"
 #include "nvim/os/os.h"
 #include "nvim/os/time.h"
 
diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index 6bdc58c54a..e324a8bedc 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -358,8 +358,6 @@ enum {
 #define SHOWCMD_COLS 10                 /* columns needed by shown command */
 #define STL_MAX_ITEM 80                 /* max nr of %<flag> in statusline */
 
-typedef void        *vim_acl_T;         /* dummy to pass an ACL to a function */
-
 /*
  * fnamecmp() is used to compare file names.
  * On some systems case in a file name does not matter, on others it does.
-- 
cgit