Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Added wchar.h to fix build on some platforms with new wcs* functions
- Loading branch information
|
@@ -615,7 +615,7 @@ endif() |
|
|
if(LIBC) |
|
|
if(WINDOWS AND NOT MINGW) |
|
|
set(HAVE_LIBC TRUE) |
|
|
foreach(_HEADER stdio.h string.h ctype.h math.h) |
|
|
foreach(_HEADER stdio.h string.h wchar.h ctype.h math.h) |
|
|
string(TOUPPER "HAVE_${_HEADER}" _UPPER) |
|
|
string(REPLACE "." "_" _HAVE_H ${_UPPER}) |
|
|
set(${_HAVE_H} 1) |
|
@@ -642,7 +642,7 @@ if(LIBC) |
|
|
check_include_file(sys/types.h HAVE_SYS_TYPES_H) |
|
|
foreach(_HEADER |
|
|
stdio.h stdlib.h stddef.h stdarg.h malloc.h memory.h string.h |
|
|
strings.h inttypes.h stdint.h ctype.h math.h iconv.h signal.h) |
|
|
strings.h wchar.h inttypes.h stdint.h ctype.h math.h iconv.h signal.h) |
|
|
string(TOUPPER "HAVE_${_HEADER}" _UPPER) |
|
|
string(REPLACE "." "_" _HAVE_H ${_UPPER}) |
|
|
check_include_file("${_HEADER}" ${_HAVE_H}) |
|
|
|
@@ -16167,7 +16167,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h |
|
|
|
|
|
fi |
|
|
|
|
|
for ac_header in sys/types.h stdio.h stdlib.h stddef.h stdarg.h malloc.h memory.h string.h strings.h inttypes.h stdint.h ctype.h math.h iconv.h signal.h |
|
|
for ac_header in sys/types.h stdio.h stdlib.h stddef.h stdarg.h malloc.h memory.h string.h strings.h wchar.h inttypes.h stdint.h ctype.h math.h iconv.h signal.h |
|
|
do : |
|
|
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
|
|
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" |
|
|
|
@@ -234,7 +234,7 @@ if test x$enable_libc = xyes; then |
|
|
|
|
|
dnl Check for C library headers |
|
|
AC_HEADER_STDC |
|
|
AC_CHECK_HEADERS(sys/types.h stdio.h stdlib.h stddef.h stdarg.h malloc.h memory.h string.h strings.h inttypes.h stdint.h ctype.h math.h iconv.h signal.h) |
|
|
AC_CHECK_HEADERS(sys/types.h stdio.h stdlib.h stddef.h stdarg.h malloc.h memory.h string.h strings.h wchar.h inttypes.h stdint.h ctype.h math.h iconv.h signal.h) |
|
|
|
|
|
dnl Check for typedefs, structures, etc. |
|
|
AC_TYPE_SIZE_T |
|
|
|
@@ -73,6 +73,7 @@ |
|
|
#cmakedefine HAVE_MEMORY_H 1 |
|
|
#cmakedefine HAVE_STRING_H 1 |
|
|
#cmakedefine HAVE_STRINGS_H 1 |
|
|
#cmakedefine HAVE_WCHAR_H 1 |
|
|
#cmakedefine HAVE_INTTYPES_H 1 |
|
|
#cmakedefine HAVE_STDINT_H 1 |
|
|
#cmakedefine HAVE_CTYPE_H 1 |
|
|
|
@@ -73,6 +73,7 @@ |
|
|
#undef HAVE_MEMORY_H |
|
|
#undef HAVE_STRING_H |
|
|
#undef HAVE_STRINGS_H |
|
|
#undef HAVE_WCHAR_H |
|
|
#undef HAVE_INTTYPES_H |
|
|
#undef HAVE_STDINT_H |
|
|
#undef HAVE_CTYPE_H |
|
|
|
@@ -62,6 +62,9 @@ |
|
|
#ifdef HAVE_STRINGS_H |
|
|
# include <strings.h> |
|
|
#endif |
|
|
#ifdef HAVE_WCHAR_H |
|
|
# include <wchar.h> |
|
|
#endif |
|
|
#if defined(HAVE_INTTYPES_H) |
|
|
# include <inttypes.h> |
|
|
#elif defined(HAVE_STDINT_H) |
|
|