1
0
Fork 0

[F] Fixed includes

This commit is contained in:
seleznevae 2018-05-06 13:12:28 +03:00
parent d6ec32cb5f
commit 9a14de9ac4
8 changed files with 19 additions and 13 deletions

View File

@ -1,7 +1,7 @@
#include "cell.h" #include "cell.h"
#include "options.h" #include "options.h"
#include "string_buffer.h" #include "string_buffer.h"
#include "assert.h" #include <assert.h>
/***************************************************************************** /*****************************************************************************
* CELL * CELL

View File

@ -24,13 +24,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#include "stdlib.h" #include <stdlib.h>
#include "stdarg.h" #include <stdarg.h>
#include "stdio.h" #include <stdio.h>
#include "fort.h" #include "fort.h"
#include "assert.h" #include <assert.h>
#include "string.h" #include <string.h>
#include "wchar.h" #include <wchar.h>
#include <ctype.h> #include <ctype.h>
#include "vector.h" #include "vector.h"
@ -633,6 +633,8 @@ clear:
} }
#ifdef FT_HAVE_WCHAR
const wchar_t *ft_to_wstring(const ft_table_t *table) const wchar_t *ft_to_wstring(const ft_table_t *table)
{ {
typedef wchar_t char_type; typedef wchar_t char_type;
@ -735,6 +737,7 @@ clear:
#undef cur_F_STRDUP #undef cur_F_STRDUP
} }
#endif
/* /*

View File

@ -1,5 +1,7 @@
#include "fort_impl.h" #include "fort_impl.h"
#ifdef FT_HAVE_WCHAR
#include <wchar.h> #include <wchar.h>
#endif

View File

@ -1,6 +1,6 @@
#include <assert.h>
#include "options.h" #include "options.h"
#include "fort_impl.h" #include "fort_impl.h"
#include "assert.h"
#include "vector.h" #include "vector.h"
/***************************************************************************** /*****************************************************************************

View File

@ -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, 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) size_t row_height, const context_t *context)
@ -998,5 +999,6 @@ clear:
return -1; return -1;
} }
#endif

View File

@ -3,12 +3,12 @@
#include "fort_impl.h" #include "fort_impl.h"
#include "fort.h" #include "fort.h"
#include "stdarg.h" #include <stdarg.h>
#include "options.h" #include "options.h"
#ifdef FT_HAVE_WCHAR #ifdef FT_HAVE_WCHAR
#include <wchar.h> #include <wchar.h>
#endif #endif
struct fort_row; struct fort_row;
typedef struct fort_row fort_row_t; typedef struct fort_row fort_row_t;

View File

@ -1,9 +1,9 @@
#include "string_buffer.h" #include "string_buffer.h"
#include "options.h" #include "options.h"
#include "assert.h"
#include "wchar.h"
#include "wcwidth.h" #include "wcwidth.h"
#include <assert.h>
#include <stddef.h> #include <stddef.h>
#include <wchar.h>
/***************************************************************************** /*****************************************************************************
* STRING BUFFER * STRING BUFFER
* ***************************************************************************/ * ***************************************************************************/

View File

@ -2,7 +2,6 @@
#define TABLE_H #define TABLE_H
#include "fort_impl.h" #include "fort_impl.h"
#include "fort.h"
struct ft_table; struct ft_table;
typedef struct ft_table ft_table_t; typedef struct ft_table ft_table_t;