From 1e73c009deec41444f1c3ed24f61c9960e219186 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 24 Aug 2021 16:21:23 +0100
Subject: [PATCH] [Minor] Fix build

---
 contrib/replxx/src/conversion.hxx    | 9 +++++++--
 contrib/replxx/src/unicodestring.hxx | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/contrib/replxx/src/conversion.hxx b/contrib/replxx/src/conversion.hxx
index 6587ad0e2..05ea64fd2 100644
--- a/contrib/replxx/src/conversion.hxx
+++ b/contrib/replxx/src/conversion.hxx
@@ -1,14 +1,19 @@
 #ifndef REPLXX_CONVERSION_HXX_INCLUDED
 #define REPLXX_CONVERSION_HXX_INCLUDED 1
 
-#include "ConvertUTF.h"
-
 #ifdef __has_include
 #if __has_include( <version> )
 #include <version>
 #endif
 #endif
 
+typedef enum {
+	conversionOK,    /* conversion successful */
+	sourceExhausted, /* partial character in source, but hit end */
+	targetExhausted, /* insuff. room in target for conversion */
+	sourceIllegal    /* source sequence is illegal/malformed */
+} ConversionResult;
+
 #if ! ( defined( __cpp_lib_char8_t ) || ( defined( __clang_major__ ) && ( __clang_major__ >= 8 ) && ( __cplusplus > 201703L ) ) )
 namespace replxx {
 typedef unsigned char char8_t;
diff --git a/contrib/replxx/src/unicodestring.hxx b/contrib/replxx/src/unicodestring.hxx
index 22f3e4695..8ff98a729 100644
--- a/contrib/replxx/src/unicodestring.hxx
+++ b/contrib/replxx/src/unicodestring.hxx
@@ -3,6 +3,7 @@
 
 #include <vector>
 #include <cstring>
+#include <string>
 
 #include "conversion.hxx"
 
-- 
2.39.5