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 ec1be46b78d98abf2d99fbd31cbd9b5849d3128f..4300cb8677c5c03b7fc084b6dddbacf813edaa71 100644 (file)
--- 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 382f8064959e3e4cc105d3ece4a756a0a88f701c..2f31c5fba5bc0d1e97daf768824d1342e1205db2 100644 (file)
--- 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 140dc05a75f8fd54eac33e48a7aa2f6467b2d27e..75f070859980d060a6d37c1272063cdf5bbf0385 100644 (file)
--- 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)