2009-04-13  Ozkan Sezer  <sezeroz@gmail.com>

	* gdtoa/gdtoaimp.h: Always define INFNAN_CHECK when IEEE_Arith is
	defined (which already is the case for mingw32/64, from current gdtoa
	source at netlib.org.) Wrap the MULTIPLE_THREADS and USE_LOCALE
	definitions at the top of the file between __MINGWxx__ ifdefs.


git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@768 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog
index 0980924..558e8b4 100644
--- a/mingw-w64-crt/ChangeLog
+++ b/mingw-w64-crt/ChangeLog
@@ -8,6 +8,10 @@
 	code.
 	* gdtoa/gdtoa.h: For mingw32/64, define Long as int (32 bit integer)
 	instead of long. Undefine NO_LONG_LONG (we always have 'long long'.)
+	* gdtoa/gdtoaimp.h: Always define INFNAN_CHECK when IEEE_Arith is
+	defined (which already is the case for mingw32/64, from current gdtoa
+	source at netlib.org.) Wrap the MULTIPLE_THREADS and USE_LOCALE
+	definitions at the top of the file between __MINGWxx__ ifdefs.
 	* gdtoa/gd_arith.h, gdtoa/gd_qnan.h: Regenerated.
 
 2009-04-13  Ozkan Sezer  <sezeroz@gmail.com>
diff --git a/mingw-w64-crt/gdtoa/gdtoaimp.h b/mingw-w64-crt/gdtoa/gdtoaimp.h
index cd7f025..609a446 100644
--- a/mingw-w64-crt/gdtoa/gdtoaimp.h
+++ b/mingw-w64-crt/gdtoa/gdtoaimp.h
@@ -170,9 +170,10 @@
 #include "gdtoa.h"
 #include "gd_qnan.h"
 
-#define INFNAN_CHECK 1
+#if defined(__MINGW32__) || defined(__MINGW64__)
 #define MULTIPLE_THREADS 1
 #define USE_LOCALE 1
+#endif		/* MinGW */
 
 #ifdef DEBUG
 #include <stdio.h>
@@ -581,6 +582,10 @@
  * (On HP Series 700/800 machines, -DNAN_WORD0=0x7ff40000 works.)
  */
 #ifdef IEEE_Arith
+#ifndef NO_INFNAN_CHECK
+#undef INFNAN_CHECK
+#define INFNAN_CHECK
+#endif
 #ifdef IEEE_MC68k
 #define _0 0
 #define _1 1