From 3c01382b95364ce40f0cf9856865a30af77f9690 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 17 May 2018 17:59:50 -0700
Subject: [PATCH] Avoid warnings about repeated typedefs

---
 include/tree_sitter/parser.h  | 7 +++++--
 include/tree_sitter/runtime.h | 2 +-
 src/runtime/language.h        | 2 +-
 src/runtime/lexer.h           | 4 ++--
 src/runtime/subtree.h         | 6 +++---
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/include/tree_sitter/parser.h b/include/tree_sitter/parser.h
index 35e77a87..1b6c2b13 100644
--- a/include/tree_sitter/parser.h
+++ b/include/tree_sitter/parser.h
@@ -13,7 +13,10 @@ extern "C" {
 #define ts_builtin_sym_end 0
 #define TREE_SITTER_SERIALIZATION_BUFFER_SIZE 1024
 
+#ifndef TREE_SITTER_RUNTIME_H_
 typedef uint16_t TSSymbol;
+typedef struct TSLanguage TSLanguage;
+#endif
 
 typedef uint16_t TSStateId;
 
@@ -67,7 +70,7 @@ typedef union {
   };
 } TSParseActionEntry;
 
-typedef struct TSLanguage {
+struct TSLanguage {
   uint32_t version;
   uint32_t symbol_count;
   uint32_t alias_count;
@@ -92,7 +95,7 @@ typedef struct TSLanguage {
     unsigned (*serialize)(void *, char *);
     void (*deserialize)(void *, const char *, unsigned);
   } external_scanner;
-} TSLanguage;
+};
 
 /*
  *  Lexer Macros
diff --git a/include/tree_sitter/runtime.h b/include/tree_sitter/runtime.h
index e0badebd..b483ba7f 100644
--- a/include/tree_sitter/runtime.h
+++ b/include/tree_sitter/runtime.h
@@ -12,7 +12,7 @@ extern "C" {
 
 #define TREE_SITTER_LANGUAGE_VERSION 8
 
-typedef unsigned short TSSymbol;
+typedef uint16_t TSSymbol;
 typedef struct TSLanguage TSLanguage;
 typedef struct TSParser TSParser;
 typedef struct TSTree TSTree;
diff --git a/src/runtime/language.h b/src/runtime/language.h
index 879a5b5b..8386a054 100644
--- a/src/runtime/language.h
+++ b/src/runtime/language.h
@@ -5,8 +5,8 @@
 extern "C" {
 #endif
 
-#include "tree_sitter/parser.h"
 #include "runtime/subtree.h"
+#include "tree_sitter/parser.h"
 
 #define ts_builtin_sym_error_repeat (ts_builtin_sym_error - 1)
 
diff --git a/src/runtime/lexer.h b/src/runtime/lexer.h
index 90be55a7..d6cf6279 100644
--- a/src/runtime/lexer.h
+++ b/src/runtime/lexer.h
@@ -5,10 +5,10 @@
 extern "C" {
 #endif
 
-#include "tree_sitter/parser.h"
-#include "tree_sitter/runtime.h"
 #include "runtime/length.h"
 #include "runtime/subtree.h"
+#include "tree_sitter/runtime.h"
+#include "tree_sitter/parser.h"
 
 typedef struct {
   TSLexer data;
diff --git a/src/runtime/subtree.h b/src/runtime/subtree.h
index cf59db43..ec8e3032 100644
--- a/src/runtime/subtree.h
+++ b/src/runtime/subtree.h
@@ -6,11 +6,11 @@ extern "C" {
 #endif
 
 #include <stdbool.h>
-#include "tree_sitter/parser.h"
-#include "tree_sitter/runtime.h"
+#include <stdio.h>
 #include "runtime/length.h"
 #include "runtime/array.h"
-#include <stdio.h>
+#include "tree_sitter/runtime.h"
+#include "tree_sitter/parser.h"
 
 extern TSStateId TS_TREE_STATE_NONE;