Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes to wint_t and wchar_t handling in unichar.h (fixes FreeBSD compilation and Mingw compilation with -pedantic)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-26 20:44:58 +00:00
parent 1f3b7817eb
commit 21f0762a1a
5 changed files with 154 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 46644 2007-06-22 18:06:12Z VZ .
# From configure.in Id: configure.in 46702 2007-06-26 11:58:21Z VS .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
#
@@ -34077,6 +34077,74 @@ _ACEOF
fi
fi
{ echo "$as_me:$LINENO: checking if wchar_t is separate type" >&5
echo $ECHO_N "checking if wchar_t is separate type... $ECHO_C" >&6; }
if test "${wx_cv_wchar_t_is_separate_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <wchar.h>
int
main ()
{
return 0; }
struct Foo { void foo(wchar_t);
void foo(unsigned short);
void foo(unsigned int);
void foo(unsigned long); };
int bar() {
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
wx_cv_wchar_t_is_separate_type=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
wx_cv_wchar_t_is_separate_type=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $wx_cv_wchar_t_is_separate_type" >&5
echo "${ECHO_T}$wx_cv_wchar_t_is_separate_type" >&6; }
if test "$wx_cv_wchar_t_is_separate_type" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxWCHAR_T_IS_SEPARATE_TYPE 1
_ACEOF
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'