3rd-party/libfort
1
0
Fork 0
Code Releases Activity

[F] Fixed compilation errors

Browse Source
This commit is contained in:
seleznevae 2018-11-04 11:22:53 +03:00
parent ece19c8bcb
commit dd5314ff37
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/fort.c
View File

@ -3100,7 +3100,7 @@ const char *str_n_substring_beg(const char *str, char ch_separator, size_t n)
return str ? (str + 1) : NULL; return str ? (str + 1) : NULL;
} }
#ifdef FT_HAVE_WCHAR
FT_INTERNAL FT_INTERNAL
const wchar_t *wstr_n_substring_beg(const wchar_t *str, wchar_t ch_separator, size_t n) const wchar_t *wstr_n_substring_beg(const wchar_t *str, wchar_t ch_separator, size_t n)
{ {
@ -3121,6 +3121,7 @@ const wchar_t *wstr_n_substring_beg(const wchar_t *str, wchar_t ch_separator, si
} }
return str ? (str + 1) : NULL; return str ? (str + 1) : NULL;
} }
#endif /* FT_HAVE_WCHAR */
FT_INTERNAL FT_INTERNAL
@ -3143,7 +3144,7 @@ void str_n_substring(const char *str, char ch_separator, size_t n, const char **
return; return;
} }
#ifdef FT_HAVE_WCHAR
FT_INTERNAL FT_INTERNAL
void wstr_n_substring(const wchar_t *str, wchar_t ch_separator, size_t n, const wchar_t **begin, const wchar_t **end) void wstr_n_substring(const wchar_t *str, wchar_t ch_separator, size_t n, const wchar_t **begin, const wchar_t **end)
{ {
@ -3163,6 +3164,7 @@ void wstr_n_substring(const wchar_t *str, wchar_t ch_separator, size_t n, const
*end = en; *end = en;
return; return;
} }
#endif /* FT_HAVE_WCHAR */
FT_INTERNAL FT_INTERNAL
@ -3182,8 +3184,10 @@ string_buffer_t *create_string_buffer(size_t number_of_chars, enum str_buf_type
if (sz && type == CharBuf) { if (sz && type == CharBuf) {
result->str.cstr[0] = '\0'; result->str.cstr[0] = '\0';
#ifdef FT_HAVE_WCHAR
} else if (sz && type == WCharBuf) { } else if (sz && type == WCharBuf) {
result->str.wstr[0] = L'\0'; result->str.wstr[0] = L'\0';
#endif /* FT_HAVE_WCHAR */
} }
return result; return result;

8
src/string_buffer.c
View File

@ -88,7 +88,7 @@ const char *str_n_substring_beg(const char *str, char ch_separator, size_t n)
return str ? (str + 1) : NULL; return str ? (str + 1) : NULL;
} }
#ifdef FT_HAVE_WCHAR
FT_INTERNAL FT_INTERNAL
const wchar_t *wstr_n_substring_beg(const wchar_t *str, wchar_t ch_separator, size_t n) const wchar_t *wstr_n_substring_beg(const wchar_t *str, wchar_t ch_separator, size_t n)
{ {
@ -109,6 +109,7 @@ const wchar_t *wstr_n_substring_beg(const wchar_t *str, wchar_t ch_separator, si
} }
return str ? (str + 1) : NULL; return str ? (str + 1) : NULL;
} }
#endif /* FT_HAVE_WCHAR */
FT_INTERNAL FT_INTERNAL
@ -131,7 +132,7 @@ void str_n_substring(const char *str, char ch_separator, size_t n, const char **
return; return;
} }
#ifdef FT_HAVE_WCHAR
FT_INTERNAL FT_INTERNAL
void wstr_n_substring(const wchar_t *str, wchar_t ch_separator, size_t n, const wchar_t **begin, const wchar_t **end) void wstr_n_substring(const wchar_t *str, wchar_t ch_separator, size_t n, const wchar_t **begin, const wchar_t **end)
{ {
@ -151,6 +152,7 @@ void wstr_n_substring(const wchar_t *str, wchar_t ch_separator, size_t n, const
*end = en; *end = en;
return; return;
} }
#endif /* FT_HAVE_WCHAR */
FT_INTERNAL FT_INTERNAL
@ -170,8 +172,10 @@ string_buffer_t *create_string_buffer(size_t number_of_chars, enum str_buf_type
if (sz && type == CharBuf) { if (sz && type == CharBuf) {
result->str.cstr[0] = '\0'; result->str.cstr[0] = '\0';
#ifdef FT_HAVE_WCHAR
} else if (sz && type == WCharBuf) { } else if (sz && type == WCharBuf) {
result->str.wstr[0] = L'\0'; result->str.wstr[0] = L'\0';
#endif /* FT_HAVE_WCHAR */
} }
return result; return result;