From fb72f1ee37872137c19297268e3cc2a05f27c357 Mon Sep 17 00:00:00 2001
From: Nicolas Hillegeer <nicolas@hillegeer.com>
Date: Sun, 6 Jul 2014 17:13:28 +0200
Subject: vim: move long_u from vim.h to types.h

Seems to make no difference to the main binary, but it helps the tests a bit
further along.
---
 src/nvim/memfile_defs.h | 2 ++
 src/nvim/types.h        | 5 +++++
 src/nvim/vim.h          | 5 -----
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/nvim/memfile_defs.h b/src/nvim/memfile_defs.h
index 818246d6db..2e6e914b57 100644
--- a/src/nvim/memfile_defs.h
+++ b/src/nvim/memfile_defs.h
@@ -1,6 +1,8 @@
 #ifndef NVIM_MEMFILE_DEFS_H
 #define NVIM_MEMFILE_DEFS_H
 
+#include "nvim/types.h"
+
 typedef struct block_hdr bhdr_T;
 typedef long blocknr_T;
 
diff --git a/src/nvim/types.h b/src/nvim/types.h
index 3bc6bfb9bf..a3c4509756 100644
--- a/src/nvim/types.h
+++ b/src/nvim/types.h
@@ -10,6 +10,11 @@
 
 #include <stdint.h>
 
+// 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.
+typedef unsigned long long_u;
+
 /*
  * Shorthand for unsigned variables. Many systems, but not all, have u_char
  * already defined, so we use char_u to avoid trouble.
diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index 63b9436da7..1ff49c8011 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -58,11 +58,6 @@ Error: configure did not run properly.Check auto/config.log.
 
 #define NUMBUFLEN 30        /* length of a buffer to store a number in ASCII */
 
-// 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.
-typedef unsigned long long_u;
-
 # define MAX_TYPENR 65535
 
 /*
-- 
cgit