[MLton-commit] r4589

[Stephen W. <sw...@ml...>]

Renamed dtoa as gdtoa_dtoa, since dtoa is defined on Cygwin.

----------------------------------------------------------------------

U   mlton/branches/on-20050822-x86_64-branch/runtime/gdtoa-patch

----------------------------------------------------------------------

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/gdtoa-patch
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/gdtoa-patch	2006-05-25 00:31:28 UTC (rev 4588)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/gdtoa-patch	2006-05-25 00:32:01 UTC (rev 4589)
@@ -1,6 +1,6 @@
 diff -P -C 2 -r gdtoa/arithchk.c gdtoa-new/arithchk.c
 *** gdtoa/arithchk.c	1998-06-19 13:46:11.000000000 -0700
---- gdtoa-new/arithchk.c	2006-05-10 14:12:02.477056503 -0700
+--- gdtoa-new/arithchk.c	2006-05-24 17:02:44.303399187 -0700
 ***************
 *** 137,141 ****
   	}
@@ -14,18 +14,45 @@
 ! int main()
   {
   	Akind *a = 0;
+Binary files gdtoa/arithchk.out and gdtoa-new/arithchk.out differ
+diff -P -C 2 -r gdtoa/dtoa.c gdtoa-new/dtoa.c
+*** gdtoa/dtoa.c	2000-11-02 07:09:01.000000000 -0800
+--- gdtoa-new/dtoa.c	2006-05-24 17:04:27.987435180 -0700
+***************
+*** 81,85 ****
+  
+   char *
+! dtoa
+  #ifdef KR_headers
+  	(d, mode, ndigits, decpt, sign, rve)
+--- 81,85 ----
+  
+   char *
+! gdtoa_dtoa
+  #ifdef KR_headers
+  	(d, mode, ndigits, decpt, sign, rve)
 diff -P -C 2 -r gdtoa/gdtoa.h gdtoa-new/gdtoa.h
 *** gdtoa/gdtoa.h	2000-11-01 07:01:39.000000000 -0800
---- gdtoa-new/gdtoa.h	2006-05-10 14:06:30.680495461 -0700
+--- gdtoa-new/gdtoa.h	2006-05-24 17:04:17.015912822 -0700
 ***************
-*** 114,119 ****
+*** 109,119 ****
+  #endif
+  
+! extern char* dtoa  ANSI((double d, int mode, int ndigits, int *decpt,
+  			int *sign, char **rve));
+  extern char* gdtoa ANSI((FPI *fpi, int be, ULong *bits, int *kindp,
   			int mode, int ndigits, int *decpt, char **rve));
   extern void freedtoa ANSI((char*));
 ! extern float  strtof ANSI((CONST char *, char **));
 ! extern double strtod ANSI((CONST char *, char **));
   extern int strtodg ANSI((CONST char*, char**, FPI*, Long*, ULong*));
   
---- 114,119 ----
+--- 109,119 ----
+  #endif
+  
+! extern char* gdtoa_dtoa  ANSI((double d, int mode, int ndigits, int *decpt,
+  			int *sign, char **rve));
+  extern char* gdtoa ANSI((FPI *fpi, int be, ULong *bits, int *kindp,
   			int mode, int ndigits, int *decpt, char **rve));
   extern void freedtoa ANSI((char*));
 ! extern float  gdtoa_strtof ANSI((CONST char *, char **));
@@ -34,7 +61,7 @@
   
 diff -P -C 2 -r gdtoa/strtod.c gdtoa-new/strtod.c
 *** gdtoa/strtod.c	2003-03-21 13:24:01.000000000 -0800
---- gdtoa-new/strtod.c	2006-05-10 14:05:47.597263849 -0700
+--- gdtoa-new/strtod.c	2006-05-24 17:02:44.309398379 -0700
 ***************
 *** 59,63 ****
   
@@ -50,7 +77,7 @@
   	(s00, se) CONST char *s00; char **se;
 diff -P -C 2 -r gdtoa/strtof.c gdtoa-new/strtof.c
 *** gdtoa/strtof.c	2000-11-01 20:31:40.000000000 -0800
---- gdtoa-new/strtof.c	2006-05-10 14:06:15.872478149 -0700
+--- gdtoa-new/strtof.c	2006-05-24 17:02:44.309398379 -0700
 ***************
 *** 38,46 ****
   #include "gdtoaimp.h"