diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake index bfa8d60144..8e3ec91d94 100644 --- a/build/cmake/setup.cmake +++ b/build/cmake/setup.cmake @@ -533,10 +533,6 @@ if(MSVC) check_symbol_exists(vsscanf stdio.h HAVE_VSSCANF) endif() -# at least under IRIX with mipsPro the C99 round() function is available when -# building using the C compiler but not when using C++ one -check_cxx_symbol_exists(round math.h HAVE_ROUND) - # Check includes check_include_file(fcntl.h HAVE_FCNTL_H) check_include_file(langinfo.h HAVE_LANGINFO_H) diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in index 10c59f02a5..7fbe260543 100644 --- a/build/cmake/setup.h.in +++ b/build/cmake/setup.h.in @@ -857,9 +857,6 @@ /* Define if fsync() is available */ #cmakedefine HAVE_FSYNC 1 -/* Define if round() is available */ -#cmakedefine HAVE_ROUND 1 - /* Define if you have ftime() */ #cmakedefine HAVE_FTIME 1 diff --git a/configure b/configure index 7b066ebda7..f35f16bc12 100755 --- a/configure +++ b/configure @@ -32936,51 +32936,6 @@ _ACEOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for round" >&5 -$as_echo_n "checking for round... " >&6; } -if ${wx_cv_func_round+:} false; then : - $as_echo_n "(cached) " >&6 -else - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -return int(round(0.0)) - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - wx_cv_func_round=yes -else - wx_cv_func_round=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_round" >&5 -$as_echo "$wx_cv_func_round" >&6; } -if test "$wx_cv_func_round" = yes; then - $as_echo "#define HAVE_ROUND 1" >>confdefs.h - -fi - if test "$TOOLKIT" != "MSW"; then if test "$wxUSE_LIBICONV" != "no" ; then diff --git a/configure.in b/configure.in index 7787c0ad21..5e3a8cd147 100644 --- a/configure.in +++ b/configure.in @@ -3871,20 +3871,6 @@ if test "$wxUSE_FILE" = "yes"; then WX_CHECK_FUNCS(fsync) fi -dnl at least under IRIX with mipsPro the C99 round() function is available when -dnl building using the C compiler but not when using C++ one -AC_CACHE_CHECK([for round], wx_cv_func_round, [ -AC_LANG_PUSH(C++) -AC_TRY_LINK( - [#include ], - [return int(round(0.0))], - wx_cv_func_round=yes, wx_cv_func_round=no) -AC_LANG_POP() -]) -if test "$wx_cv_func_round" = yes; then - AC_DEFINE(HAVE_ROUND) -fi - dnl the following tests are for Unix(like) systems only if test "$TOOLKIT" != "MSW"; then diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h index fbf6e4b3c7..178edbc100 100644 --- a/include/wx/osx/config_xcode.h +++ b/include/wx/osx/config_xcode.h @@ -39,7 +39,6 @@ #define HAVE_CXA_DEMANGLE 1 #define HAVE_GETTIMEOFDAY 1 #define HAVE_FSYNC 1 -#define HAVE_ROUND 1 #define HAVE_SCHED_YIELD 1 #define HAVE_PTHREAD_MUTEXATTR_T 1 #define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1 diff --git a/setup.h.in b/setup.h.in index 6af7a1452d..8cd3dcf198 100644 --- a/setup.h.in +++ b/setup.h.in @@ -855,9 +855,6 @@ /* Define if fsync() is available */ #undef HAVE_FSYNC -/* Define if round() is available */ -#undef HAVE_ROUND - /* Define if you have ftime() */ #undef HAVE_FTIME