From d51dc7378bbf85d8d8db8deadbc74b594c93826c Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 6 Sep 2017 01:14:23 -0700 Subject: [PATCH] Fixed bug 3797 - configure check for float.h Ozkan Sezer Cmake checks for float.h, but configure does not: the attached patch adds float.h to checked headers in configury, and it adds the missing HAVE_FLOAT_H macro to SDL_config.h.cmake and SDL_config.h.in. In SDL_config_macosx.h and SDL_config_windows.h, defined HAVE_FLOAT_H as 1, where I know that it's true. --- configure | 2 +- configure.in | 2 +- include/SDL_config.h.cmake | 1 + include/SDL_config.h.in | 1 + include/SDL_config_macosx.h | 1 + include/SDL_config_windows.h | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 18096ae8a456f..d3595e325ff9d 100755 --- a/configure +++ b/configure @@ -16169,7 +16169,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 wchar.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 float.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 bb61002902ff6..68790f9b4e900 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 wchar.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 float.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 c57266c413081..96641e76806fb 100644 --- a/include/SDL_config.h.cmake +++ b/include/SDL_config.h.cmake @@ -78,6 +78,7 @@ #cmakedefine HAVE_STDINT_H 1 #cmakedefine HAVE_CTYPE_H 1 #cmakedefine HAVE_MATH_H 1 +#cmakedefine HAVE_FLOAT_H 1 #cmakedefine HAVE_ICONV_H 1 #cmakedefine HAVE_SIGNAL_H 1 #cmakedefine HAVE_ALTIVEC_H 1 diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in index 8b3d20880be17..57de49b09a512 100644 --- a/include/SDL_config.h.in +++ b/include/SDL_config.h.in @@ -78,6 +78,7 @@ #undef HAVE_STDINT_H #undef HAVE_CTYPE_H #undef HAVE_MATH_H +#undef HAVE_FLOAT_H #undef HAVE_ICONV_H #undef HAVE_SIGNAL_H #undef HAVE_ALTIVEC_H diff --git a/include/SDL_config_macosx.h b/include/SDL_config_macosx.h index 9b09899529925..3e1ace17d5660 100644 --- a/include/SDL_config_macosx.h +++ b/include/SDL_config_macosx.h @@ -46,6 +46,7 @@ #define HAVE_STDINT_H 1 #define HAVE_CTYPE_H 1 #define HAVE_MATH_H 1 +#define HAVE_FLOAT_H 1 #define HAVE_SIGNAL_H 1 /* C library functions */ diff --git a/include/SDL_config_windows.h b/include/SDL_config_windows.h index 2456c843fe563..0538a9101ac52 100644 --- a/include/SDL_config_windows.h +++ b/include/SDL_config_windows.h @@ -91,6 +91,7 @@ typedef unsigned int uintptr_t; #define HAVE_STRING_H 1 #define HAVE_CTYPE_H 1 #define HAVE_MATH_H 1 +#define HAVE_FLOAT_H 1 #define HAVE_SIGNAL_H 1 /* C library functions */