cheng/mpir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply patches to fix t-locale failure on Windows. Supplied by (sav-ix)

Browse Source 
Alexander.
This commit is contained in:
William Hart 2017-02-13 14:59:43 +00:00
parent f14f867eb6
commit 9499401eaa
2 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/cxx/clocale.c
View File

@ -43,8 +43,7 @@ MA 02110-1301, USA. */
extern char point_string[];
#ifndef __MINGW64__
#if HAVE_LOCALECONV
#if HAVE_LOCALECONV && ! (defined(__MINGW32__) || defined(_MSC_VER))
struct lconv *
localeconv (void)
{
@ -53,7 +52,6 @@ localeconv (void)
return &l;
}
#endif
#endif
#if HAVE_NL_LANGINFO
char *

42
tests/misc/t-locale.c
View File

@ -50,36 +50,20 @@ char *decimal_point;
/* Replace the libc localeconv with one we can manipulate. */
/*
The t-local test fails on
mingw64 ie defined(_WIN64) && !defined(_MSC_VER)
to detect a non-msvc 64bit windows the above is the best solution ,
but as we are using it to exclude a test ,
it would be better to only limit it to mingw64 only and not some
other future 64bit windows gcc , so it's best in this case to use the
defined(__MINGW64__) macro
msvc with version<=1500 ie defined(_MSC_VER) && _MSC_VER <= 1500
The t-local test fails on MinGW, MinGW-W64 and Microsoft C/C++
compilers because of their own 'localeconv' implementation.
The goal is to detect those compilers and skip 'localeconv'
redefinition so the 't-locale' test ends up in
printf("Test skipped...")
which shows that replacing 'localeconv' is disabled (on Windows).
It's best in this case to use '__MINGW32__' macro, which is
common for all
MinGW (i686), MinGW-W64 (i686) and MinGW-W64 (x86_64), and '_MSC_VER'
for Microsoft C/C++ Compiler, details at
http://sourceforge.net/p/predef/wiki/Compilers/
*/
#if _MSC_VER && __GMP_LIBGMP_DLL
int
main (void)
{
printf ("Test suppressed for windows DLL\n");
exit (0);
}
#else /* ! DLL_EXPORT */
#if ! (defined(__MINGW64_VERSION_MAJOR) || (defined(_MSC_VER) && _MSC_VER <= 1500))
#if HAVE_LOCALECONV
#ifdef _MSC_VER
__GMP_DECLSPEC
#endif
#if HAVE_LOCALECONV && ! (defined(__MINGW32__) || defined(_MSC_VER))
struct lconv *
localeconv (void)
{
@ -88,7 +72,6 @@ localeconv (void)
return &l;
}
#endif
#endif
/* Replace the libc nl_langinfo with one we can manipulate. */
#if HAVE_NL_LANGINFO
@ -227,4 +210,3 @@ main (void)
exit (0);
}
#endif