[Gmp-commit] /var/hg/gmp: 2 new changesets

[mercurial at gmplib.org]

details:   /var/hg/gmp/rev/0887ffe45794
changeset: 17012:0887ffe45794
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Fri Jan 01 21:35:36 2016 +0100
description:
tests/: Do not redefine localeconv when mingw is used.

details:   /var/hg/gmp/rev/60c77e71e1d3
changeset: 17013:60c77e71e1d3
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Fri Jan 01 21:41:57 2016 +0100
description:
ChangeLog

diffstat:

 ChangeLog             |   7 ++++++-
 tests/cxx/clocale.c   |   2 +-
 tests/misc/t-locale.c |  11 +----------
 3 files changed, 8 insertions(+), 12 deletions(-)

diffs (61 lines):

diff -r af62e8f245fe -r 60c77e71e1d3 ChangeLog
--- a/ChangeLog	Mon Dec 28 18:56:14 2015 +0100
+++ b/ChangeLog	Fri Jan 01 21:41:57 2016 +0100
@@ -1,3 +1,8 @@
+2016-01-01 Marco Bodrato <bodrato at mail.dm.unipi.it>
+
+	* tests/cxx/clocale.c: Do not re-define localeconv for mingw.
+	* tests/misc/t-locale.c: Enable test for mingw (tx Alexander).
+
 2015-12-28 Marco Bodrato <bodrato at mail.dm.unipi.it>
 
 	* mpq/set_str.c: Use __GMP_FREE_FUNC_TYPE.
@@ -666,7 +671,7 @@
 	(speed_mpn_add_1, speed_mpn_add_1_inplace): New functions.
 	(speed_mpn_sub_1, speed_mpn_sub_1_inplace): New functions.
 	* tune/speed.h: Declare them all.
-        * tune/speed.c (routine): Added mpn_neg, mpn_add_1, mpn_sub_1,
+	* tune/speed.c (routine): Added mpn_neg, mpn_add_1, mpn_sub_1,
 	mpn_add_1_inplace, mpn_sub_1_inplace, and mpz_2fac_ui.
 
 2015-04-25 Marco Bodrato <bodrato at mail.dm.unipi.it>
diff -r af62e8f245fe -r 60c77e71e1d3 tests/cxx/clocale.c
--- a/tests/cxx/clocale.c	Mon Dec 28 18:56:14 2015 +0100
+++ b/tests/cxx/clocale.c	Fri Jan 01 21:41:57 2016 +0100
@@ -41,7 +41,7 @@
 
 extern char point_string[];
 
-#if HAVE_LOCALECONV
+#if HAVE_LOCALECONV && ! defined __MINGW32__
 struct lconv *
 localeconv (void)
 #if defined __cplusplus && defined __GLIBC__
diff -r af62e8f245fe -r 60c77e71e1d3 tests/misc/t-locale.c
--- a/tests/misc/t-locale.c	Mon Dec 28 18:56:14 2015 +0100
+++ b/tests/misc/t-locale.c	Fri Jan 01 21:41:57 2016 +0100
@@ -41,18 +41,10 @@
 #include "gmp-impl.h"
 #include "tests.h"
 
-#ifdef __MINGW32__
-int
-main (void)
-{
-  exit (0);
-}
-#else
-
 const char *decimal_point;
 
 /* Replace the libc localeconv with one we can manipulate. */
-#if HAVE_LOCALECONV
+#if HAVE_LOCALECONV && ! defined __MINGW32__
 struct lconv *
 localeconv (void)
 #if defined __cplusplus && defined __GLIBC__
@@ -204,4 +196,3 @@
   tests_memory_end ();
   exit (0);
 }
-#endif