From 31dacda87423a181da352b0873de55db1a430b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eliseo=20Marti=CC=81nez?= <eliseomarmol@gmail.com>
Date: Tue, 13 Jan 2015 11:30:01 +0100
Subject: [PATCH] Remove long_u: (various): Refactor long_u.

---
 src/nvim/spell.c  | 3 ++-
 src/nvim/syntax.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/nvim/spell.c b/src/nvim/spell.c
index 5e69a935ca..bb995fe3c2 100644
--- a/src/nvim/spell.c
+++ b/src/nvim/spell.c
@@ -289,6 +289,7 @@
 #include <inttypes.h>
 #include <limits.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 #include <wctype.h>
@@ -6546,7 +6547,7 @@ node_compress (
       n = np->wn_flags + (np->wn_region << 8) + (np->wn_affixID << 16);
     else
       // byte node: use the byte value and the child pointer
-      n = (unsigned)(np->wn_byte + ((long_u)np->wn_child << 8));
+      n = (unsigned)(np->wn_byte + ((uintptr_t)np->wn_child << 8));
     nr = nr * 101 + n;
   }
 
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 3980a4d8e6..f24b2aa80a 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -3837,7 +3837,7 @@ static void add_keyword(char_u *name,
   }
   kp->next_list = copy_id_list(next_list);
 
-  long_u hash = hash_hash(kp->keyword);
+  hash_T hash = hash_hash(kp->keyword);
   hashtab_T *ht = (curwin->w_s->b_syn_ic) ? &curwin->w_s->b_keywtab_ic
                                           : &curwin->w_s->b_keywtab;
   hashitem_T *hi = hash_lookup(ht, kp->keyword, hash);