fix a typo in wxUSE_UNICODE test when choosing between strtoull and wcstoull; include wchar.h when testing for the latter

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-16 02:39:03 +00:00
parent 64ec9666a6
commit ac706d114d
2 changed files with 5 additions and 5 deletions

6
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Id: configure.in 53975 2008-06-04 10:52:33Z SN . # From configure.in Id: configure.in 54569 2008-07-10 01:33:28Z RD .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.8. # Generated by GNU Autoconf 2.59 for wxWidgets 2.8.8.
# #
@@ -24872,7 +24872,7 @@ 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_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
if test "wxUSE_UNICODE" = "yes"; then if test "$wxUSE_UNICODE" = "yes"; then
for wx_func in wcstoull for wx_func in wcstoull
do do
@@ -24890,7 +24890,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#include <wchar.h>
$ac_includes_default $ac_includes_default
int int

View File

@@ -2786,8 +2786,8 @@ dnl
dnl at least under SGI these functions are only available in C99 code and not dnl at least under SGI these functions are only available in C99 code and not
dnl in C++ so do these tests using C++ compiler dnl in C++ so do these tests using C++ compiler
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
if test "wxUSE_UNICODE" = "yes"; then if test "$wxUSE_UNICODE" = "yes"; then
WX_CHECK_FUNCS(wcstoull) WX_CHECK_FUNCS(wcstoull,,,[#include <wchar.h>])
else else
WX_CHECK_FUNCS(strtoull) WX_CHECK_FUNCS(strtoull)
fi fi