From: Steve Bennett <steveb@workware.net.au>
Date: Wed, 4 Nov 2020 01:38:10 +0000 (+1000)
Subject: don't reinclude utf8.h in "shipped" version
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=56dab0c9ad434d6128f38f017d83ad9f32fe1cb6;p=linenoise.git

don't reinclude utf8.h in "shipped" version

linenoise-ship.c already includes utf8.h, so
don't reinclude it

Signed-off-by: Steve Bennett <steveb@workware.net.au>
---

diff --git a/linenoise.c b/linenoise.c
index ec1be46..4300cb8 100644
--- a/linenoise.c
+++ b/linenoise.c
@@ -145,7 +145,9 @@
 #ifndef STRINGBUF_H
 #include "stringbuf.h"
 #endif
+#ifndef UTF8_UTIL_H
 #include "utf8.h"
+#endif
 
 #define LINENOISE_DEFAULT_HISTORY_MAX_LEN 100
 
diff --git a/stringbuf.c b/stringbuf.c
index 382f806..2f31c5f 100644
--- a/stringbuf.c
+++ b/stringbuf.c
@@ -15,8 +15,10 @@
 #include "stringbuf.h"
 #endif
 #ifdef USE_UTF8
+#ifndef UTF8_UTIL_H
 #include "utf8.h"
 #endif
+#endif
 
 #define SB_INCREMENT 200
 
diff --git a/utf8.c b/utf8.c
index 140dc05..75f0708 100644
--- a/utf8.c
+++ b/utf8.c
@@ -31,7 +31,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#ifndef UTF8_UTIL_H
 #include "utf8.h"
+#endif
 
 #ifdef USE_UTF8
 int utf8_fromunicode(char *p, unsigned uc)