From 48cb80ea9413f8adfbffa103133d42e7b0b9e50f Mon Sep 17 00:00:00 2001
From: Jared Simpson <jared.simpson@gmail.com>
Date: Wed, 19 Feb 2020 09:35:49 -0500
Subject: [PATCH 1/2] change kstring_t integer storage size

This is for compatibility with kstring_t in htslib.
---
 kseq.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kseq.h b/kseq.h
index 8021e56..15d7983 100644
--- a/kseq.h
+++ b/kseq.h
@@ -89,7 +89,7 @@
 #ifndef KSTRING_T
 #define KSTRING_T kstring_t
 typedef struct __kstring_t {
-	unsigned l, m;
+	size_t l, m;
 	char *s;
 } kstring_t;
 #endif

From d2de282d21e9b621dc5f6cef293cb60b93cc553d Mon Sep 17 00:00:00 2001
From: Jared Simpson <jared.simpson@gmail.com>
Date: Mon, 2 Mar 2020 12:44:08 -0500
Subject: [PATCH 2/2] remove second definition of kstring

---
 mmpriv.h | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/mmpriv.h b/mmpriv.h
index 65c7cd9..ffba6eb 100644
--- a/mmpriv.h
+++ b/mmpriv.h
@@ -4,6 +4,7 @@
 #include <assert.h>
 #include "minimap.h"
 #include "bseq.h"
+#include "kseq.h"
 
 #define MM_PARENT_UNSET   (-1)
 #define MM_PARENT_TMP_PRI (-2)
@@ -35,14 +36,6 @@
 extern "C" {
 #endif
 
-#ifndef KSTRING_T
-#define KSTRING_T kstring_t
-typedef struct __kstring_t {
-	unsigned l, m;
-	char *s;
-} kstring_t;
-#endif
-
 typedef struct {
 	int n_u, n_a;
 	uint64_t *u;