From 9a14de9ac49bbd2c61ed1a35d4c1bd6ac92a55f5 Mon Sep 17 00:00:00 2001
From: seleznevae <seleznevae@protonmail.com>
Date: Sun, 6 May 2018 13:12:28 +0300
Subject: [PATCH] [F] Fixed includes

---
 src/cell.c          |  2 +-
 src/fort.c          | 15 +++++++++------
 src/fort_impl.c     |  2 ++
 src/options.c       |  2 +-
 src/row.c           |  2 ++
 src/row.h           |  4 ++--
 src/string_buffer.c |  4 ++--
 src/table.h         |  1 -
 8 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/cell.c b/src/cell.c
index 60646f8..16c48eb 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -1,7 +1,7 @@
 #include "cell.h"
 #include "options.h"
 #include "string_buffer.h"
-#include "assert.h"
+#include <assert.h>
 
 /*****************************************************************************
  *               CELL
diff --git a/src/fort.c b/src/fort.c
index 020a439..c90424f 100644
--- a/src/fort.c
+++ b/src/fort.c
@@ -24,13 +24,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "stdlib.h"
-#include "stdarg.h"
-#include "stdio.h"
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
 #include "fort.h"
-#include "assert.h"
-#include "string.h"
-#include "wchar.h"
+#include <assert.h>
+#include <string.h>
+#include <wchar.h>
 #include <ctype.h>
 
 #include "vector.h"
@@ -633,6 +633,8 @@ clear:
 }
 
 
+#ifdef FT_HAVE_WCHAR
+
 const wchar_t *ft_to_wstring(const ft_table_t *table)
 {
     typedef wchar_t char_type;
@@ -735,6 +737,7 @@ clear:
 #undef cur_F_STRDUP
 }
 
+#endif
 
 
 /*
diff --git a/src/fort_impl.c b/src/fort_impl.c
index 74a73dd..83646e6 100644
--- a/src/fort_impl.c
+++ b/src/fort_impl.c
@@ -1,5 +1,7 @@
 #include "fort_impl.h"
+#ifdef FT_HAVE_WCHAR
 #include <wchar.h>
+#endif
 
 
 
diff --git a/src/options.c b/src/options.c
index d8557b5..7c47f52 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1,6 +1,6 @@
+#include <assert.h>
 #include "options.h"
 #include "fort_impl.h"
-#include "assert.h"
 #include "vector.h"
 
 /*****************************************************************************
diff --git a/src/row.c b/src/row.c
index 2883746..ba3393e 100644
--- a/src/row.c
+++ b/src/row.c
@@ -910,6 +910,7 @@ clear:
 }
 
 
+#ifdef FT_HAVE_WCHAR
 
 int wsnprintf_row(const fort_row_t *row, wchar_t *buffer, size_t buf_sz, size_t *col_width_arr, size_t col_width_arr_sz,
                   size_t row_height, const context_t *context)
@@ -998,5 +999,6 @@ clear:
     return -1;
 }
 
+#endif
 
 
diff --git a/src/row.h b/src/row.h
index 1660133..239d469 100644
--- a/src/row.h
+++ b/src/row.h
@@ -3,12 +3,12 @@
 
 #include "fort_impl.h"
 #include "fort.h"
-#include "stdarg.h"
+#include <stdarg.h>
 #include "options.h"
-
 #ifdef FT_HAVE_WCHAR
 #include <wchar.h>
 #endif
+
 struct fort_row;
 typedef struct fort_row fort_row_t;
 
diff --git a/src/string_buffer.c b/src/string_buffer.c
index e2730c1..5064ddd 100644
--- a/src/string_buffer.c
+++ b/src/string_buffer.c
@@ -1,9 +1,9 @@
 #include "string_buffer.h"
 #include "options.h"
-#include "assert.h"
-#include "wchar.h"
 #include "wcwidth.h"
+#include <assert.h>
 #include <stddef.h>
+#include <wchar.h>
 /*****************************************************************************
  *               STRING BUFFER
  * ***************************************************************************/
diff --git a/src/table.h b/src/table.h
index f914e5c..528536f 100644
--- a/src/table.h
+++ b/src/table.h
@@ -2,7 +2,6 @@
 #define TABLE_H
 
 #include "fort_impl.h"
-#include "fort.h"
 
 struct ft_table;
 typedef struct ft_table ft_table_t;