From f8de064c0ae7720d426dd7b2843e8efc7b3c8437 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 13 Aug 2017 22:26:44 -0700 Subject: [PATCH] Added wchar.h to fix build on some platforms with new wcs* functions --- CMakeLists.txt | 4 ++-- configure | 2 +- configure.in | 2 +- include/SDL_config.h.cmake | 1 + include/SDL_config.h.in | 1 + include/SDL_stdinc.h | 3 +++ 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a8a564c5c65b6..06662ee25ad8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}) diff --git a/configure b/configure index 67723943bf25d..3ad1eed344c17 100755 --- a/configure +++ b/configure @@ -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" diff --git a/configure.in b/configure.in index 321a56bdeb611..db2e07c4b5108 100644 --- a/configure.in +++ b/configure.in @@ -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 diff --git a/include/SDL_config.h.cmake b/include/SDL_config.h.cmake index 43f31d312f35e..faf71ca523681 100644 --- a/include/SDL_config.h.cmake +++ b/include/SDL_config.h.cmake @@ -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 diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in index 19ba454266c07..a03e573064481 100644 --- a/include/SDL_config.h.in +++ b/include/SDL_config.h.in @@ -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 diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h index 646fbfc2d0090..38c8876f5cd5e 100644 --- a/include/SDL_stdinc.h +++ b/include/SDL_stdinc.h @@ -62,6 +62,9 @@ #ifdef HAVE_STRINGS_H # include #endif +#ifdef HAVE_WCHAR_H +# include +#endif #if defined(HAVE_INTTYPES_H) # include #elif defined(HAVE_STDINT_H)