Commit f8de064c0ae7720d426dd7b2843e8efc7b3c8437
2017-08-13T22:26:44
Added wchar.h to fix build on some platforms with new wcs* functions
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8a564c..06662ee 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 6772394..3ad1eed 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 321a56b..db2e07c 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 43f31d3..faf71ca 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 19ba454..a03e573 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 646fbfc..38c8876 100644
--- a/include/SDL_stdinc.h
+++ b/include/SDL_stdinc.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)