| 1 | diff -Naur gdtoa.1/dmisc.c gdtoa.2/dmisc.c |
| 2 | --- gdtoa.1/dmisc.c 2016-02-19 17:09:46.000000000 +0000 |
| 3 | +++ gdtoa.2/dmisc.c 2018-01-25 20:50:09.000000000 +0000 |
| 4 | @@ -83,9 +83,9 @@ |
| 5 | |
| 6 | void |
| 7 | #ifdef KR_headers |
| 8 | -freedtoa(s) char *s; |
| 9 | +gdtoa__freedtoa(s) char *s; |
| 10 | #else |
| 11 | -freedtoa(char *s) |
| 12 | +gdtoa__freedtoa(char *s) |
| 13 | #endif |
| 14 | { |
| 15 | #ifdef MULTIPLE_THREADS |
| 16 | diff -Naur gdtoa.1/dtoa.c gdtoa.2/dtoa.c |
| 17 | --- gdtoa.1/dtoa.c 2016-04-29 22:46:32.000000000 +0000 |
| 18 | +++ gdtoa.2/dtoa.c 2018-01-25 20:50:09.000000000 +0000 |
| 19 | @@ -73,7 +73,7 @@ |
| 20 | #endif |
| 21 | |
| 22 | char * |
| 23 | -dtoa |
| 24 | +gdtoa__dtoa |
| 25 | #ifdef KR_headers |
| 26 | (d0, mode, ndigits, decpt, sign, rve) |
| 27 | double d0; int mode, ndigits, *decpt, *sign; char **rve; |
| 28 | @@ -149,7 +149,7 @@ |
| 29 | |
| 30 | #ifndef MULTIPLE_THREADS |
| 31 | if (dtoa_result) { |
| 32 | - freedtoa(dtoa_result); |
| 33 | + gdtoa__freedtoa(dtoa_result); |
| 34 | dtoa_result = 0; |
| 35 | } |
| 36 | #endif |
| 37 | diff -Naur gdtoa.1/g_Qfmt.c gdtoa.2/g_Qfmt.c |
| 38 | --- gdtoa.1/g_Qfmt.c 2016-02-18 23:25:54.000000000 +0000 |
| 39 | +++ gdtoa.2/g_Qfmt.c 2018-01-25 20:50:09.000000000 +0000 |
| 40 | @@ -51,9 +51,9 @@ |
| 41 | |
| 42 | char* |
| 43 | #ifdef KR_headers |
| 44 | -g_Qfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; size_t bufsize; |
| 45 | +gdtoa__g_Qfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; size_t bufsize; |
| 46 | #else |
| 47 | -g_Qfmt(char *buf, void *V, int ndig, size_t bufsize) |
| 48 | +gdtoa__g_Qfmt(char *buf, void *V, int ndig, size_t bufsize) |
| 49 | #endif |
| 50 | { |
| 51 | static FPI fpi0 = { 113, 1-16383-113+1, 32766 - 16383 - 113 + 1, 1, 0, Int_max }; |
| 52 | @@ -114,6 +114,6 @@ |
| 53 | return 0; |
| 54 | mode = 0; |
| 55 | } |
| 56 | - s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 57 | + s = gdtoa__gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 58 | return g__fmt(buf, s, se, decpt, sign, bufsize); |
| 59 | } |
| 60 | diff -Naur gdtoa.1/g_Qfmt_p.c gdtoa.2/g_Qfmt_p.c |
| 61 | --- gdtoa.1/g_Qfmt_p.c 2016-02-19 00:17:33.000000000 +0000 |
| 62 | +++ gdtoa.2/g_Qfmt_p.c 2018-01-25 20:50:09.000000000 +0000 |
| 63 | @@ -53,9 +53,9 @@ |
| 64 | |
| 65 | char* |
| 66 | #ifdef KR_headers |
| 67 | -g_Qfmt_p(buf, V, ndig, bufsize, nik) char *buf; char *V; int ndig; size_t bufsize; int nik; |
| 68 | +gdtoa__g_Qfmt_p(buf, V, ndig, bufsize, nik) char *buf; char *V; int ndig; size_t bufsize; int nik; |
| 69 | #else |
| 70 | -g_Qfmt_p(char *buf, void *V, int ndig, size_t bufsize, int nik) |
| 71 | +gdtoa__g_Qfmt_p(char *buf, void *V, int ndig, size_t bufsize, int nik) |
| 72 | #endif |
| 73 | { |
| 74 | static FPI fpi0 = { 113, 1-16383-113+1, 32766 - 16383 - 113 + 1, 1, 0, Int_max }; |
| 75 | @@ -127,6 +127,6 @@ |
| 76 | return 0; |
| 77 | mode = 0; |
| 78 | } |
| 79 | - s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 80 | + s = gdtoa__gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 81 | return g__fmt(buf, s, se, decpt, sign, bufsize); |
| 82 | } |
| 83 | diff -Naur gdtoa.1/g__fmt.c gdtoa.2/g__fmt.c |
| 84 | --- gdtoa.1/g__fmt.c 2012-12-24 01:41:26.000000000 +0000 |
| 85 | +++ gdtoa.2/g__fmt.c 2018-01-25 20:50:09.000000000 +0000 |
| 86 | @@ -166,7 +166,7 @@ |
| 87 | *b = 0; |
| 88 | } |
| 89 | ret: |
| 90 | - freedtoa(s0); |
| 91 | + gdtoa__freedtoa(s0); |
| 92 | return b; |
| 93 | } |
| 94 | |
| 95 | diff -Naur gdtoa.1/g_ddfmt.c gdtoa.2/g_ddfmt.c |
| 96 | --- gdtoa.1/g_ddfmt.c 2016-02-19 18:25:24.000000000 +0000 |
| 97 | +++ gdtoa.2/g_ddfmt.c 2018-01-25 20:50:09.000000000 +0000 |
| 98 | @@ -33,9 +33,9 @@ |
| 99 | |
| 100 | char * |
| 101 | #ifdef KR_headers |
| 102 | -g_ddfmt(buf, dd0, ndig, bufsize) char *buf; double *dd0; int ndig; size_t bufsize; |
| 103 | +gdtoa__g_ddfmt(buf, dd0, ndig, bufsize) char *buf; double *dd0; int ndig; size_t bufsize; |
| 104 | #else |
| 105 | -g_ddfmt(char *buf, double *dd0, int ndig, size_t bufsize) |
| 106 | +gdtoa__g_ddfmt(char *buf, double *dd0, int ndig, size_t bufsize) |
| 107 | #endif |
| 108 | { |
| 109 | FPI fpi; |
| 110 | @@ -167,7 +167,7 @@ |
| 111 | fpi.sudden_underflow = 0; |
| 112 | fpi.int_max = Int_max; |
| 113 | i = STRTOG_Normal; |
| 114 | - s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 115 | + s = gdtoa__gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 116 | b = g__fmt(buf, s, se, decpt, z->sign, bufsize); |
| 117 | Bfree(z MTb); |
| 118 | return b; |
| 119 | diff -Naur gdtoa.1/g_ddfmt_p.c gdtoa.2/g_ddfmt_p.c |
| 120 | --- gdtoa.1/g_ddfmt_p.c 2016-02-19 18:25:36.000000000 +0000 |
| 121 | +++ gdtoa.2/g_ddfmt_p.c 2018-01-25 20:50:09.000000000 +0000 |
| 122 | @@ -35,9 +35,9 @@ |
| 123 | |
| 124 | char * |
| 125 | #ifdef KR_headers |
| 126 | -g_ddfmt_p(buf, dd0, ndig, bufsize, nik) char *buf; double *dd0; int ndig; size_t bufsize; int nik; |
| 127 | +gdtoa__g_ddfmt_p(buf, dd0, ndig, bufsize, nik) char *buf; double *dd0; int ndig; size_t bufsize; int nik; |
| 128 | #else |
| 129 | -g_ddfmt_p(char *buf, double *dd0, int ndig, size_t bufsize, int nik) |
| 130 | +gdtoa__g_ddfmt_p(char *buf, double *dd0, int ndig, size_t bufsize, int nik) |
| 131 | #endif |
| 132 | { |
| 133 | FPI fpi; |
| 134 | @@ -187,7 +187,7 @@ |
| 135 | fpi.sudden_underflow = 0; |
| 136 | fpi.int_max = Int_max; |
| 137 | i = STRTOG_Normal; |
| 138 | - s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 139 | + s = gdtoa__gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 140 | b = g__fmt(buf, s, se, decpt, z->sign, bufsize); |
| 141 | Bfree(z MTb); |
| 142 | return b; |
| 143 | diff -Naur gdtoa.1/g_dfmt.c gdtoa.2/g_dfmt.c |
| 144 | --- gdtoa.1/g_dfmt.c 2016-02-19 00:24:17.000000000 +0000 |
| 145 | +++ gdtoa.2/g_dfmt.c 2018-01-25 20:50:09.000000000 +0000 |
| 146 | @@ -33,9 +33,9 @@ |
| 147 | |
| 148 | char* |
| 149 | #ifdef KR_headers |
| 150 | -g_dfmt(buf, d, ndig, bufsize) char *buf; double *d; int ndig; size_t bufsize; |
| 151 | +gdtoa__g_dfmt(buf, d, ndig, bufsize) char *buf; double *d; int ndig; size_t bufsize; |
| 152 | #else |
| 153 | -g_dfmt(char *buf, double *d, int ndig, size_t bufsize) |
| 154 | +gdtoa__g_dfmt(char *buf, double *d, int ndig, size_t bufsize) |
| 155 | #endif |
| 156 | { |
| 157 | static FPI fpi0 = { 53, 1-1023-53+1, 2046-1023-53+1, 1, 0, Int_max }; |
| 158 | @@ -90,6 +90,6 @@ |
| 159 | i = STRTOG_Normal; |
| 160 | if (sign) |
| 161 | i = STRTOG_Normal | STRTOG_Neg; |
| 162 | - s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 163 | + s = gdtoa__gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 164 | return g__fmt(buf, s, se, decpt, sign, bufsize); |
| 165 | } |
| 166 | diff -Naur gdtoa.1/g_dfmt_p.c gdtoa.2/g_dfmt_p.c |
| 167 | --- gdtoa.1/g_dfmt_p.c 2016-02-19 00:25:27.000000000 +0000 |
| 168 | +++ gdtoa.2/g_dfmt_p.c 2018-01-25 20:50:09.000000000 +0000 |
| 169 | @@ -35,9 +35,9 @@ |
| 170 | |
| 171 | char* |
| 172 | #ifdef KR_headers |
| 173 | -g_dfmt_p(buf, d, ndig, bufsize, nik) char *buf; double *d; int ndig; size_t bufsize; int nik; |
| 174 | +gdtoa__g_dfmt_p(buf, d, ndig, bufsize, nik) char *buf; double *d; int ndig; size_t bufsize; int nik; |
| 175 | #else |
| 176 | -g_dfmt_p(char *buf, double *d, int ndig, size_t bufsize, int nik) |
| 177 | +gdtoa__g_dfmt_p(char *buf, double *d, int ndig, size_t bufsize, int nik) |
| 178 | #endif |
| 179 | { |
| 180 | static FPI fpi0 = { 53, 1-1023-53+1, 2046-1023-53+1, 1, 0, Int_max }; |
| 181 | @@ -105,6 +105,6 @@ |
| 182 | i = STRTOG_Normal; |
| 183 | if (sign) |
| 184 | i = STRTOG_Normal | STRTOG_Neg; |
| 185 | - s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 186 | + s = gdtoa__gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 187 | return g__fmt(buf, s, se, decpt, sign, bufsize); |
| 188 | } |
| 189 | diff -Naur gdtoa.1/g_ffmt.c gdtoa.2/g_ffmt.c |
| 190 | --- gdtoa.1/g_ffmt.c 2016-02-19 00:26:51.000000000 +0000 |
| 191 | +++ gdtoa.2/g_ffmt.c 2018-01-25 20:50:09.000000000 +0000 |
| 192 | @@ -33,9 +33,9 @@ |
| 193 | |
| 194 | char* |
| 195 | #ifdef KR_headers |
| 196 | -g_ffmt(buf, f, ndig, bufsize) char *buf; float *f; int ndig; size_t bufsize; |
| 197 | +gdtoa__g_ffmt(buf, f, ndig, bufsize) char *buf; float *f; int ndig; size_t bufsize; |
| 198 | #else |
| 199 | -g_ffmt(char *buf, float *f, int ndig, size_t bufsize) |
| 200 | +gdtoa__g_ffmt(char *buf, float *f, int ndig, size_t bufsize) |
| 201 | #endif |
| 202 | { |
| 203 | static FPI fpi0 = { 24, 1-127-24+1, 254-127-24+1, 1, 0, 6 }; |
| 204 | @@ -88,6 +88,6 @@ |
| 205 | mode = 0; |
| 206 | } |
| 207 | i = STRTOG_Normal; |
| 208 | - s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 209 | + s = gdtoa__gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 210 | return g__fmt(buf, s, se, decpt, sign, bufsize); |
| 211 | } |
| 212 | diff -Naur gdtoa.1/g_ffmt_p.c gdtoa.2/g_ffmt_p.c |
| 213 | --- gdtoa.1/g_ffmt_p.c 2016-02-19 00:28:16.000000000 +0000 |
| 214 | +++ gdtoa.2/g_ffmt_p.c 2018-01-25 20:50:09.000000000 +0000 |
| 215 | @@ -35,9 +35,9 @@ |
| 216 | |
| 217 | char* |
| 218 | #ifdef KR_headers |
| 219 | -g_ffmt_p(buf, f, ndig, bufsize, nik) char *buf; float *f; int ndig; size_t bufsize; int nik; |
| 220 | +gdtoa__g_ffmt_p(buf, f, ndig, bufsize, nik) char *buf; float *f; int ndig; size_t bufsize; int nik; |
| 221 | #else |
| 222 | -g_ffmt_p(char *buf, float *f, int ndig, size_t bufsize, int nik) |
| 223 | +gdtoa__g_ffmt_p(char *buf, float *f, int ndig, size_t bufsize, int nik) |
| 224 | #endif |
| 225 | { |
| 226 | static FPI fpi0 = { 24, 1-127-24+1, 254-127-24+1, 1, 0, 6 }; |
| 227 | @@ -99,6 +99,6 @@ |
| 228 | mode = 0; |
| 229 | } |
| 230 | i = STRTOG_Normal; |
| 231 | - s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 232 | + s = gdtoa__gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 233 | return g__fmt(buf, s, se, decpt, sign, bufsize); |
| 234 | } |
| 235 | diff -Naur gdtoa.1/g_xLfmt.c gdtoa.2/g_xLfmt.c |
| 236 | --- gdtoa.1/g_xLfmt.c 2016-02-19 00:29:17.000000000 +0000 |
| 237 | +++ gdtoa.2/g_xLfmt.c 2018-01-25 20:50:09.000000000 +0000 |
| 238 | @@ -49,9 +49,9 @@ |
| 239 | |
| 240 | char* |
| 241 | #ifdef KR_headers |
| 242 | -g_xLfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; size_t bufsize; |
| 243 | +gdtoa__g_xLfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; size_t bufsize; |
| 244 | #else |
| 245 | -g_xLfmt(char *buf, void *V, int ndig, size_t bufsize) |
| 246 | +gdtoa__g_xLfmt(char *buf, void *V, int ndig, size_t bufsize) |
| 247 | #endif |
| 248 | { |
| 249 | static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0, Int_max }; |
| 250 | @@ -108,6 +108,6 @@ |
| 251 | return 0; |
| 252 | mode = 0; |
| 253 | } |
| 254 | - s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 255 | + s = gdtoa__gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 256 | return g__fmt(buf, s, se, decpt, sign, bufsize); |
| 257 | } |
| 258 | diff -Naur gdtoa.1/g_xLfmt_p.c gdtoa.2/g_xLfmt_p.c |
| 259 | --- gdtoa.1/g_xLfmt_p.c 2016-02-19 00:30:18.000000000 +0000 |
| 260 | +++ gdtoa.2/g_xLfmt_p.c 2018-01-25 20:50:09.000000000 +0000 |
| 261 | @@ -51,9 +51,9 @@ |
| 262 | |
| 263 | char* |
| 264 | #ifdef KR_headers |
| 265 | -g_xLfmt_p(buf, V, ndig, bufsize, nik) char *buf; char *V; int ndig; size_t bufsize; int nik; |
| 266 | +gdtoa__g_xLfmt_p(buf, V, ndig, bufsize, nik) char *buf; char *V; int ndig; size_t bufsize; int nik; |
| 267 | #else |
| 268 | -g_xLfmt_p(char *buf, void *V, int ndig, size_t bufsize, int nik) |
| 269 | +gdtoa__g_xLfmt_p(char *buf, void *V, int ndig, size_t bufsize, int nik) |
| 270 | #endif |
| 271 | { |
| 272 | static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0, Int_max }; |
| 273 | @@ -120,6 +120,6 @@ |
| 274 | return 0; |
| 275 | mode = 0; |
| 276 | } |
| 277 | - s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 278 | + s = gdtoa__gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 279 | return g__fmt(buf, s, se, decpt, sign, bufsize); |
| 280 | } |
| 281 | diff -Naur gdtoa.1/g_xfmt.c gdtoa.2/g_xfmt.c |
| 282 | --- gdtoa.1/g_xfmt.c 2016-02-19 00:31:49.000000000 +0000 |
| 283 | +++ gdtoa.2/g_xfmt.c 2018-01-25 20:50:09.000000000 +0000 |
| 284 | @@ -53,9 +53,9 @@ |
| 285 | |
| 286 | char* |
| 287 | #ifdef KR_headers |
| 288 | -g_xfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; size_t bufsize; |
| 289 | +gdtoa__g_xfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; size_t bufsize; |
| 290 | #else |
| 291 | -g_xfmt(char *buf, void *V, int ndig, size_t bufsize) |
| 292 | +gdtoa__g_xfmt(char *buf, void *V, int ndig, size_t bufsize) |
| 293 | #endif |
| 294 | { |
| 295 | static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0, Int_max }; |
| 296 | @@ -114,6 +114,6 @@ |
| 297 | return 0; |
| 298 | mode = 0; |
| 299 | } |
| 300 | - s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 301 | + s = gdtoa__gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 302 | return g__fmt(buf, s, se, decpt, sign, bufsize); |
| 303 | } |
| 304 | diff -Naur gdtoa.1/g_xfmt_p.c gdtoa.2/g_xfmt_p.c |
| 305 | --- gdtoa.1/g_xfmt_p.c 2016-02-19 00:32:49.000000000 +0000 |
| 306 | +++ gdtoa.2/g_xfmt_p.c 2018-01-25 20:50:09.000000000 +0000 |
| 307 | @@ -55,9 +55,9 @@ |
| 308 | |
| 309 | char* |
| 310 | #ifdef KR_headers |
| 311 | -g_xfmt_p(buf, V, ndig, bufsize, nik) char *buf; char *V; int ndig; size_t bufsize; int nik; |
| 312 | +gdtoa__g_xfmt_p(buf, V, ndig, bufsize, nik) char *buf; char *V; int ndig; size_t bufsize; int nik; |
| 313 | #else |
| 314 | -g_xfmt_p(char *buf, void *V, int ndig, size_t bufsize, int nik) |
| 315 | +gdtoa__g_xfmt_p(char *buf, void *V, int ndig, size_t bufsize, int nik) |
| 316 | #endif |
| 317 | { |
| 318 | static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0, Int_max }; |
| 319 | @@ -130,6 +130,6 @@ |
| 320 | return 0; |
| 321 | mode = 0; |
| 322 | } |
| 323 | - s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 324 | + s = gdtoa__gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); |
| 325 | return g__fmt(buf, s, se, decpt, sign, bufsize); |
| 326 | } |
| 327 | diff -Naur gdtoa.1/gdtoa.c gdtoa.2/gdtoa.c |
| 328 | --- gdtoa.1/gdtoa.c 2016-03-25 14:26:52.000000000 +0000 |
| 329 | +++ gdtoa.2/gdtoa.c 2018-01-25 20:50:09.000000000 +0000 |
| 330 | @@ -109,7 +109,7 @@ |
| 331 | */ |
| 332 | |
| 333 | char * |
| 334 | -gdtoa |
| 335 | +gdtoa__gdtoa |
| 336 | #ifdef KR_headers |
| 337 | (fpi, be, bits, kindp, mode, ndigits, decpt, rve) |
| 338 | CONST FPI *fpi; int be; ULong *bits; |
| 339 | @@ -167,7 +167,7 @@ |
| 340 | |
| 341 | #ifndef MULTIPLE_THREADS |
| 342 | if (dtoa_result) { |
| 343 | - freedtoa(dtoa_result); |
| 344 | + gdtoa__freedtoa(dtoa_result); |
| 345 | dtoa_result = 0; |
| 346 | } |
| 347 | #endif |
| 348 | diff -Naur gdtoa.1/gdtoa.h gdtoa.2/gdtoa.h |
| 349 | --- gdtoa.1/gdtoa.h 2016-02-19 00:37:08.000000000 +0000 |
| 350 | +++ gdtoa.2/gdtoa.h 2018-01-25 20:53:55.000000000 +0000 |
| 351 | @@ -104,55 +104,55 @@ |
| 352 | extern "C" { |
| 353 | #endif |
| 354 | |
| 355 | -extern char* dtoa ANSI((double d, int mode, int ndigits, int *decpt, |
| 356 | +extern char* gdtoa__dtoa ANSI((double d, int mode, int ndigits, int *decpt, |
| 357 | int *sign, char **rve)); |
| 358 | -extern char* gdtoa ANSI((CONST FPI *fpi, int be, ULong *bits, int *kindp, |
| 359 | +extern char* gdtoa__gdtoa ANSI((CONST FPI *fpi, int be, ULong *bits, int *kindp, |
| 360 | int mode, int ndigits, int *decpt, char **rve)); |
| 361 | -extern void freedtoa ANSI((char*)); |
| 362 | -extern float strtof ANSI((CONST char *, char **)); |
| 363 | -extern double strtod ANSI((CONST char *, char **)); |
| 364 | -extern int strtodg ANSI((CONST char*, char**, CONST FPI*, Long*, ULong*)); |
| 365 | +extern void gdtoa__freedtoa ANSI((char*)); |
| 366 | +extern float gdtoa__strtof ANSI((CONST char *, char **)); |
| 367 | +extern double gdtoa__strtod ANSI((CONST char *, char **)); |
| 368 | +extern int gdtoa__strtodg ANSI((CONST char*, char**, CONST FPI*, Long*, ULong*)); |
| 369 | |
| 370 | -extern char* g_ddfmt ANSI((char*, double*, int, size_t)); |
| 371 | -extern char* g_ddfmt_p ANSI((char*, double*, int, size_t, int)); |
| 372 | -extern char* g_dfmt ANSI((char*, double*, int, size_t)); |
| 373 | -extern char* g_dfmt_p ANSI((char*, double*, int, size_t, int)); |
| 374 | -extern char* g_ffmt ANSI((char*, float*, int, size_t)); |
| 375 | -extern char* g_ffmt_p ANSI((char*, float*, int, size_t, int)); |
| 376 | -extern char* g_Qfmt ANSI((char*, void*, int, size_t)); |
| 377 | -extern char* g_Qfmt_p ANSI((char*, void*, int, size_t, int)); |
| 378 | -extern char* g_xfmt ANSI((char*, void*, int, size_t)); |
| 379 | -extern char* g_xfmt_p ANSI((char*, void*, int, size_t, int)); |
| 380 | -extern char* g_xLfmt ANSI((char*, void*, int, size_t)); |
| 381 | -extern char* g_xLfmt_p ANSI((char*, void*, int, size_t, int)); |
| 382 | +extern char* gdtoa__g_ddfmt ANSI((char*, double*, int, size_t)); |
| 383 | +extern char* gdtoa__g_ddfmt_p ANSI((char*, double*, int, size_t, int)); |
| 384 | +extern char* gdtoa__g_dfmt ANSI((char*, double*, int, size_t)); |
| 385 | +extern char* gdtoa__g_dfmt_p ANSI((char*, double*, int, size_t, int)); |
| 386 | +extern char* gdtoa__g_ffmt ANSI((char*, float*, int, size_t)); |
| 387 | +extern char* gdtoa__g_ffmt_p ANSI((char*, float*, int, size_t, int)); |
| 388 | +extern char* gdtoa__g_Qfmt ANSI((char*, void*, int, size_t)); |
| 389 | +extern char* gdtoa__g_Qfmt_p ANSI((char*, void*, int, size_t, int)); |
| 390 | +extern char* gdtoa__g_xfmt ANSI((char*, void*, int, size_t)); |
| 391 | +extern char* gdtoa__g_xfmt_p ANSI((char*, void*, int, size_t, int)); |
| 392 | +extern char* gdtoa__g_xLfmt ANSI((char*, void*, int, size_t)); |
| 393 | +extern char* gdtoa__g_xLfmt_p ANSI((char*, void*, int, size_t, int)); |
| 394 | |
| 395 | -extern int strtoId ANSI((CONST char*, char**, double*, double*)); |
| 396 | -extern int strtoIdd ANSI((CONST char*, char**, double*, double*)); |
| 397 | -extern int strtoIf ANSI((CONST char*, char**, float*, float*)); |
| 398 | -extern int strtoIQ ANSI((CONST char*, char**, void*, void*)); |
| 399 | -extern int strtoIx ANSI((CONST char*, char**, void*, void*)); |
| 400 | -extern int strtoIxL ANSI((CONST char*, char**, void*, void*)); |
| 401 | -extern int strtord ANSI((CONST char*, char**, int, double*)); |
| 402 | -extern int strtordd ANSI((CONST char*, char**, int, double*)); |
| 403 | -extern int strtorf ANSI((CONST char*, char**, int, float*)); |
| 404 | -extern int strtorQ ANSI((CONST char*, char**, int, void*)); |
| 405 | -extern int strtorx ANSI((CONST char*, char**, int, void*)); |
| 406 | -extern int strtorxL ANSI((CONST char*, char**, int, void*)); |
| 407 | +extern int gdtoa__strtoId ANSI((CONST char*, char**, double*, double*)); |
| 408 | +extern int gdtoa__strtoIdd ANSI((CONST char*, char**, double*, double*)); |
| 409 | +extern int gdtoa__strtoIf ANSI((CONST char*, char**, float*, float*)); |
| 410 | +extern int gdtoa__strtoIQ ANSI((CONST char*, char**, void*, void*)); |
| 411 | +extern int gdtoa__strtoIx ANSI((CONST char*, char**, void*, void*)); |
| 412 | +extern int gdtoa__strtoIxL ANSI((CONST char*, char**, void*, void*)); |
| 413 | +extern int gdtoa__strtord ANSI((CONST char*, char**, int, double*)); |
| 414 | +extern int gdtoa__strtordd ANSI((CONST char*, char**, int, double*)); |
| 415 | +extern int gdtoa__strtorf ANSI((CONST char*, char**, int, float*)); |
| 416 | +extern int gdtoa__strtorQ ANSI((CONST char*, char**, int, void*)); |
| 417 | +extern int gdtoa__strtorx ANSI((CONST char*, char**, int, void*)); |
| 418 | +extern int gdtoa__strtorxL ANSI((CONST char*, char**, int, void*)); |
| 419 | #if 1 |
| 420 | -extern int strtodI ANSI((CONST char*, char**, double*)); |
| 421 | -extern int strtopd ANSI((CONST char*, char**, double*)); |
| 422 | -extern int strtopdd ANSI((CONST char*, char**, double*)); |
| 423 | -extern int strtopf ANSI((CONST char*, char**, float*)); |
| 424 | -extern int strtopQ ANSI((CONST char*, char**, void*)); |
| 425 | -extern int strtopx ANSI((CONST char*, char**, void*)); |
| 426 | -extern int strtopxL ANSI((CONST char*, char**, void*)); |
| 427 | +extern int gdtoa__strtodI ANSI((CONST char*, char**, double*)); |
| 428 | +extern int gdtoa__strtopd ANSI((CONST char*, char**, double*)); |
| 429 | +extern int gdtoa__strtopdd ANSI((CONST char*, char**, double*)); |
| 430 | +extern int gdtoa__strtopf ANSI((CONST char*, char**, float*)); |
| 431 | +extern int gdtoa__strtopQ ANSI((CONST char*, char**, void*)); |
| 432 | +extern int gdtoa__strtopx ANSI((CONST char*, char**, void*)); |
| 433 | +extern int gdtoa__strtopxL ANSI((CONST char*, char**, void*)); |
| 434 | #else |
| 435 | -#define strtopd(s,se,x) strtord(s,se,1,x) |
| 436 | -#define strtopdd(s,se,x) strtordd(s,se,1,x) |
| 437 | -#define strtopf(s,se,x) strtorf(s,se,1,x) |
| 438 | -#define strtopQ(s,se,x) strtorQ(s,se,1,x) |
| 439 | -#define strtopx(s,se,x) strtorx(s,se,1,x) |
| 440 | -#define strtopxL(s,se,x) strtorxL(s,se,1,x) |
| 441 | +#define gdtoa__strtopd(s,se,x) gdtoa__strtord(s,se,1,x) |
| 442 | +#define gdtoa__strtopdd(s,se,x) gdtoa__strtordd(s,se,1,x) |
| 443 | +#define gdtoa__strtopf(s,se,x) gdtoa__strtorf(s,se,1,x) |
| 444 | +#define gdtoa__strtopQ(s,se,x) gdtoa__strtorQ(s,se,1,x) |
| 445 | +#define gdtoa__strtopx(s,se,x) gdtoa__strtorx(s,se,1,x) |
| 446 | +#define gdtoa__strtopxL(s,se,x) gdtoa__strtorxL(s,se,1,x) |
| 447 | #endif |
| 448 | |
| 449 | #ifdef __cplusplus |
| 450 | diff -Naur gdtoa.1/gdtoaimp.h gdtoa.2/gdtoaimp.h |
| 451 | --- gdtoa.1/gdtoaimp.h 2018-01-25 20:47:16.000000000 +0000 |
| 452 | +++ gdtoa.2/gdtoaimp.h 2018-01-25 20:50:09.000000000 +0000 |
| 453 | @@ -549,6 +549,7 @@ |
| 454 | #define g__fmt g__fmt_D2A |
| 455 | #define gethex gethex_D2A |
| 456 | #define hexdig hexdig_D2A |
| 457 | +#define hexdig_init hexdig_init_D2A |
| 458 | #define hexnan hexnan_D2A |
| 459 | #define hi0bits(x) hi0bits_D2A((ULong)(x)) |
| 460 | #define i2b i2b_D2A |
| 461 | @@ -568,6 +569,7 @@ |
| 462 | #define set_ones set_ones_D2A |
| 463 | #define strcp strcp_D2A |
| 464 | #define strtoIg strtoIg_D2A |
| 465 | +#define strtod strtod_D2A |
| 466 | #define sum sum_D2A |
| 467 | #define tens tens_D2A |
| 468 | #define tinytens tinytens_D2A |
| 469 | @@ -600,7 +602,7 @@ |
| 470 | int *decpt, int *sign, char **rve)); |
| 471 | extern char *g__fmt ANSI((char*, char*, char*, int, ULong, size_t)); |
| 472 | extern int gethex ANSI((CONST char**, CONST FPI*, Long*, Bigint**, int MTd)); |
| 473 | - extern void hexdig_init_D2A(Void); |
| 474 | + /* extern void hexdig_init ANSI((Void)); */ |
| 475 | extern int hexnan ANSI((CONST char**, CONST FPI*, ULong*)); |
| 476 | extern int hi0bits_D2A ANSI((ULong)); |
| 477 | extern Bigint *i2b ANSI((int MTd)); |
| 478 | diff -Naur gdtoa.1/gethex.c gdtoa.2/gethex.c |
| 479 | --- gdtoa.1/gethex.c 2016-05-06 18:27:52.000000000 +0000 |
| 480 | +++ gdtoa.2/gethex.c 2018-01-25 20:50:09.000000000 +0000 |
| 481 | @@ -66,7 +66,7 @@ |
| 482 | #endif |
| 483 | #endif |
| 484 | |
| 485 | - /**** if (!hexdig['0']) hexdig_init_D2A(); ****/ |
| 486 | + /**** if (!hexdig['0']) hexdig_init(); ****/ |
| 487 | *bp = 0; |
| 488 | havedig = 0; |
| 489 | s0 = *(CONST unsigned char **)sp + 2; |
| 490 | diff -Naur gdtoa.1/hd_init.c gdtoa.2/hd_init.c |
| 491 | --- gdtoa.1/hd_init.c 2012-12-20 21:20:25.000000000 +0000 |
| 492 | +++ gdtoa.2/hd_init.c 2018-01-25 20:50:09.000000000 +0000 |
| 493 | @@ -47,7 +47,7 @@ |
| 494 | } |
| 495 | |
| 496 | void |
| 497 | -hexdig_init_D2A(Void) /* Use of hexdig_init omitted 20121220 to avoid a */ |
| 498 | +hexdig_init(Void) /* Use of hexdig_init omitted 20121220 to avoid a */ |
| 499 | /* race condition when multiple threads are used. */ |
| 500 | { |
| 501 | #define USC (unsigned char *) |
| 502 | diff -Naur gdtoa.1/hexnan.c gdtoa.2/hexnan.c |
| 503 | --- gdtoa.1/hexnan.c 2016-02-19 00:43:10.000000000 +0000 |
| 504 | +++ gdtoa.2/hexnan.c 2018-01-25 20:50:09.000000000 +0000 |
| 505 | @@ -61,7 +61,7 @@ |
| 506 | CONST char *s; |
| 507 | int havedig, hd0, i, nbits; |
| 508 | |
| 509 | - /**** if (!hexdig['0']) hexdig_init_D2A(); ****/ |
| 510 | + /**** if (!hexdig['0']) hexdig_init(); ****/ |
| 511 | nbits = fpi->nbits; |
| 512 | x = x0 + (nbits >> kshift); |
| 513 | if (nbits & kmask) |
| 514 | diff -Naur gdtoa.1/strtoIQ.c gdtoa.2/strtoIQ.c |
| 515 | --- gdtoa.1/strtoIQ.c 2016-02-19 18:09:22.000000000 +0000 |
| 516 | +++ gdtoa.2/strtoIQ.c 2018-01-25 20:50:09.000000000 +0000 |
| 517 | @@ -33,9 +33,9 @@ |
| 518 | |
| 519 | int |
| 520 | #ifdef KR_headers |
| 521 | -strtoIQ(s, sp, a, b) CONST char *s; char **sp; void *a; void *b; |
| 522 | +gdtoa__strtoIQ(s, sp, a, b) CONST char *s; char **sp; void *a; void *b; |
| 523 | #else |
| 524 | -strtoIQ(CONST char *s, char **sp, void *a, void *b) |
| 525 | +gdtoa__strtoIQ(CONST char *s, char **sp, void *a, void *b) |
| 526 | #endif |
| 527 | { |
| 528 | static FPI fpi = { 113, 1-16383-113+1, 32766-16383-113+1, 1, SI, 0 /*unused*/ }; |
| 529 | diff -Naur gdtoa.1/strtoId.c gdtoa.2/strtoId.c |
| 530 | --- gdtoa.1/strtoId.c 2016-02-19 18:10:01.000000000 +0000 |
| 531 | +++ gdtoa.2/strtoId.c 2018-01-25 20:50:09.000000000 +0000 |
| 532 | @@ -33,9 +33,9 @@ |
| 533 | |
| 534 | int |
| 535 | #ifdef KR_headers |
| 536 | -strtoId(s, sp, f0, f1) CONST char *s; char **sp; double *f0, *f1; |
| 537 | +gdtoa__strtoId(s, sp, f0, f1) CONST char *s; char **sp; double *f0, *f1; |
| 538 | #else |
| 539 | -strtoId(CONST char *s, char **sp, double *f0, double *f1) |
| 540 | +gdtoa__strtoId(CONST char *s, char **sp, double *f0, double *f1) |
| 541 | #endif |
| 542 | { |
| 543 | static FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI, 0 /*unused*/ }; |
| 544 | diff -Naur gdtoa.1/strtoIdd.c gdtoa.2/strtoIdd.c |
| 545 | --- gdtoa.1/strtoIdd.c 2016-02-19 18:10:39.000000000 +0000 |
| 546 | +++ gdtoa.2/strtoIdd.c 2018-01-25 20:50:09.000000000 +0000 |
| 547 | @@ -33,9 +33,9 @@ |
| 548 | |
| 549 | int |
| 550 | #ifdef KR_headers |
| 551 | -strtoIdd(s, sp, f0, f1) CONST char *s; char **sp; double *f0, *f1; |
| 552 | +gdtoa__strtoIdd(s, sp, f0, f1) CONST char *s; char **sp; double *f0, *f1; |
| 553 | #else |
| 554 | -strtoIdd(CONST char *s, char **sp, double *f0, double *f1) |
| 555 | +gdtoa__strtoIdd(CONST char *s, char **sp, double *f0, double *f1) |
| 556 | #endif |
| 557 | { |
| 558 | #ifdef Sudden_Underflow |
| 559 | diff -Naur gdtoa.1/strtoIf.c gdtoa.2/strtoIf.c |
| 560 | --- gdtoa.1/strtoIf.c 2016-02-19 18:11:21.000000000 +0000 |
| 561 | +++ gdtoa.2/strtoIf.c 2018-01-25 20:50:09.000000000 +0000 |
| 562 | @@ -33,9 +33,9 @@ |
| 563 | |
| 564 | int |
| 565 | #ifdef KR_headers |
| 566 | -strtoIf(s, sp, f0, f1) CONST char *s; char **sp; float *f0, *f1; |
| 567 | +gdtoa__strtoIf(s, sp, f0, f1) CONST char *s; char **sp; float *f0, *f1; |
| 568 | #else |
| 569 | -strtoIf(CONST char *s, char **sp, float *f0, float *f1) |
| 570 | +gdtoa__strtoIf(CONST char *s, char **sp, float *f0, float *f1) |
| 571 | #endif |
| 572 | { |
| 573 | static FPI fpi = { 24, 1-127-24+1, 254-127-24+1, 1, SI, 0 /*unused*/ }; |
| 574 | diff -Naur gdtoa.1/strtoIg.c gdtoa.2/strtoIg.c |
| 575 | --- gdtoa.1/strtoIg.c 2016-05-06 18:41:21.000000000 +0000 |
| 576 | +++ gdtoa.2/strtoIg.c 2018-01-25 20:50:09.000000000 +0000 |
| 577 | @@ -47,7 +47,7 @@ |
| 578 | #endif |
| 579 | |
| 580 | b = *B; |
| 581 | - rv = strtodg(s00, se, fpi, exp, b->x); |
| 582 | + rv = gdtoa__strtodg(s00, se, fpi, exp, b->x); |
| 583 | if (!(rv & STRTOG_Inexact)) { |
| 584 | B[1] = 0; |
| 585 | return *rvp = rv; |
| 586 | diff -Naur gdtoa.1/strtoIx.c gdtoa.2/strtoIx.c |
| 587 | --- gdtoa.1/strtoIx.c 2016-02-19 18:11:58.000000000 +0000 |
| 588 | +++ gdtoa.2/strtoIx.c 2018-01-25 20:50:09.000000000 +0000 |
| 589 | @@ -33,9 +33,9 @@ |
| 590 | |
| 591 | int |
| 592 | #ifdef KR_headers |
| 593 | -strtoIx(s, sp, a, b) CONST char *s; char **sp; void *a; void *b; |
| 594 | +gdtoa__strtoIx(s, sp, a, b) CONST char *s; char **sp; void *a; void *b; |
| 595 | #else |
| 596 | -strtoIx(CONST char *s, char **sp, void *a, void *b) |
| 597 | +gdtoa__strtoIx(CONST char *s, char **sp, void *a, void *b) |
| 598 | #endif |
| 599 | { |
| 600 | static FPI fpi = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI, 0 /*unused*/ }; |
| 601 | diff -Naur gdtoa.1/strtoIxL.c gdtoa.2/strtoIxL.c |
| 602 | --- gdtoa.1/strtoIxL.c 2016-02-19 18:12:44.000000000 +0000 |
| 603 | +++ gdtoa.2/strtoIxL.c 2018-01-25 20:50:09.000000000 +0000 |
| 604 | @@ -33,9 +33,9 @@ |
| 605 | |
| 606 | int |
| 607 | #ifdef KR_headers |
| 608 | -strtoIxL(s, sp, a, b) CONST char *s; char **sp; void *a; void *b; |
| 609 | +gdtoa__strtoIxL(s, sp, a, b) CONST char *s; char **sp; void *a; void *b; |
| 610 | #else |
| 611 | -strtoIxL(CONST char *s, char **sp, void *a, void *b) |
| 612 | +gdtoa__strtoIxL(CONST char *s, char **sp, void *a, void *b) |
| 613 | #endif |
| 614 | { |
| 615 | static FPI fpi = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI, 0 /*unused*/ }; |
| 616 | diff -Naur gdtoa.1/strtod.c gdtoa.2/strtod.c |
| 617 | --- gdtoa.1/strtod.c 2016-05-06 14:24:41.000000000 +0000 |
| 618 | +++ gdtoa.2/strtod.c 2018-01-25 20:50:09.000000000 +0000 |
| 619 | @@ -80,7 +80,7 @@ |
| 620 | #endif /*}*/ |
| 621 | |
| 622 | double |
| 623 | -strtod |
| 624 | +gdtoa__strtod |
| 625 | #ifdef KR_headers |
| 626 | (s00, se) CONST char *s00; char **se; |
| 627 | #else |
| 628 | diff -Naur gdtoa.1/strtodI.c gdtoa.2/strtodI.c |
| 629 | --- gdtoa.1/strtodI.c 2016-02-19 04:37:08.000000000 +0000 |
| 630 | +++ gdtoa.2/strtodI.c 2018-01-25 20:50:09.000000000 +0000 |
| 631 | @@ -50,9 +50,9 @@ |
| 632 | |
| 633 | int |
| 634 | #ifdef KR_headers |
| 635 | -strtodI(s, sp, dd) CONST char *s; char **sp; double *dd; |
| 636 | +gdtoa__strtodI(s, sp, dd) CONST char *s; char **sp; double *dd; |
| 637 | #else |
| 638 | -strtodI(CONST char *s, char **sp, double *dd) |
| 639 | +gdtoa__strtodI(CONST char *s, char **sp, double *dd) |
| 640 | #endif |
| 641 | { |
| 642 | static FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI, 0 /*unused*/ }; |
| 643 | @@ -61,7 +61,7 @@ |
| 644 | int j, k; |
| 645 | U *u; |
| 646 | |
| 647 | - k = strtodg(s, sp, &fpi, &exp, bits); |
| 648 | + k = gdtoa__strtodg(s, sp, &fpi, &exp, bits); |
| 649 | u = (U*)dd; |
| 650 | sign = k & STRTOG_Neg ? 0x80000000L : 0; |
| 651 | switch(k & STRTOG_Retmask) { |
| 652 | diff -Naur gdtoa.1/strtodg.c gdtoa.2/strtodg.c |
| 653 | --- gdtoa.1/strtodg.c 2016-05-06 18:30:21.000000000 +0000 |
| 654 | +++ gdtoa.2/strtodg.c 2018-01-25 20:50:09.000000000 +0000 |
| 655 | @@ -313,7 +313,7 @@ |
| 656 | } |
| 657 | |
| 658 | int |
| 659 | -strtodg |
| 660 | +gdtoa__strtodg |
| 661 | #ifdef KR_headers |
| 662 | (s00, se, fpi, exp, bits) |
| 663 | CONST char *s00; char **se; CONST FPI *fpi; Long *exp; ULong *bits; |
| 664 | diff -Naur gdtoa.1/strtof.c gdtoa.2/strtof.c |
| 665 | --- gdtoa.1/strtof.c 2018-01-25 20:47:16.000000000 +0000 |
| 666 | +++ gdtoa.2/strtof.c 2018-01-25 20:50:09.000000000 +0000 |
| 667 | @@ -33,9 +33,9 @@ |
| 668 | |
| 669 | float |
| 670 | #ifdef KR_headers |
| 671 | -strtof(s, sp) CONST char *s; char **sp; |
| 672 | +gdtoa__strtof(s, sp) CONST char *s; char **sp; |
| 673 | #else |
| 674 | -strtof(CONST char *s, char **sp) |
| 675 | +gdtoa__strtof(CONST char *s, char **sp) |
| 676 | #endif |
| 677 | { |
| 678 | static FPI fpi0 = { 24, 1-127-24+1, 254-127-24+1, 1, SI, 0 /*unused*/ }; |
| 679 | @@ -49,7 +49,7 @@ |
| 680 | #define fpi &fpi0 |
| 681 | #endif |
| 682 | |
| 683 | - k = strtodg(s, sp, fpi, &exp, bits); |
| 684 | + k = gdtoa__strtodg(s, sp, fpi, &exp, bits); |
| 685 | switch(k & STRTOG_Retmask) { |
| 686 | default: /* unused */ |
| 687 | case STRTOG_NoNumber: |
| 688 | diff -Naur gdtoa.1/strtopQ.c gdtoa.2/strtopQ.c |
| 689 | --- gdtoa.1/strtopQ.c 2016-02-19 04:26:30.000000000 +0000 |
| 690 | +++ gdtoa.2/strtopQ.c 2018-01-25 20:50:09.000000000 +0000 |
| 691 | @@ -54,9 +54,9 @@ |
| 692 | |
| 693 | int |
| 694 | #ifdef KR_headers |
| 695 | -strtopQ(s, sp, V) CONST char *s; char **sp; void *V; |
| 696 | +gdtoa__strtopQ(s, sp, V) CONST char *s; char **sp; void *V; |
| 697 | #else |
| 698 | -strtopQ(CONST char *s, char **sp, void *V) |
| 699 | +gdtoa__strtopQ(CONST char *s, char **sp, void *V) |
| 700 | #endif |
| 701 | { |
| 702 | static FPI fpi0 = { 113, 1-16383-113+1, 32766 - 16383 - 113 + 1, 1, SI, 0 /*unused*/ }; |
| 703 | @@ -70,7 +70,7 @@ |
| 704 | #define fpi &fpi0 |
| 705 | #endif |
| 706 | |
| 707 | - k = strtodg(s, sp, fpi, &exp, bits); |
| 708 | + k = gdtoa__strtodg(s, sp, fpi, &exp, bits); |
| 709 | switch(k & STRTOG_Retmask) { |
| 710 | case STRTOG_NoNumber: |
| 711 | case STRTOG_Zero: |
| 712 | diff -Naur gdtoa.1/strtopd.c gdtoa.2/strtopd.c |
| 713 | --- gdtoa.1/strtopd.c 2016-02-19 04:40:01.000000000 +0000 |
| 714 | +++ gdtoa.2/strtopd.c 2018-01-25 20:50:09.000000000 +0000 |
| 715 | @@ -33,9 +33,9 @@ |
| 716 | |
| 717 | int |
| 718 | #ifdef KR_headers |
| 719 | -strtopd(s, sp, d) char *s; char **sp; double *d; |
| 720 | +gdtoa__strtopd(s, sp, d) char *s; char **sp; double *d; |
| 721 | #else |
| 722 | -strtopd(CONST char *s, char **sp, double *d) |
| 723 | +gdtoa__strtopd(CONST char *s, char **sp, double *d) |
| 724 | #endif |
| 725 | { |
| 726 | static FPI fpi0 = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI, 0 /*unused*/ }; |
| 727 | @@ -48,7 +48,7 @@ |
| 728 | #define fpi &fpi0 |
| 729 | #endif |
| 730 | |
| 731 | - k = strtodg(s, sp, fpi, &exp, bits); |
| 732 | + k = gdtoa__strtodg(s, sp, fpi, &exp, bits); |
| 733 | ULtod((ULong*)d, bits, exp, k); |
| 734 | return k; |
| 735 | } |
| 736 | diff -Naur gdtoa.1/strtopdd.c gdtoa.2/strtopdd.c |
| 737 | --- gdtoa.1/strtopdd.c 2018-01-25 20:47:16.000000000 +0000 |
| 738 | +++ gdtoa.2/strtopdd.c 2018-01-25 20:50:09.000000000 +0000 |
| 739 | @@ -33,9 +33,9 @@ |
| 740 | |
| 741 | int |
| 742 | #ifdef KR_headers |
| 743 | -strtopdd(s, sp, dd) CONST char *s; char **sp; double *dd; |
| 744 | +gdtoa__strtopdd(s, sp, dd) CONST char *s; char **sp; double *dd; |
| 745 | #else |
| 746 | -strtopdd(CONST char *s, char **sp, double *dd) |
| 747 | +gdtoa__strtopdd(CONST char *s, char **sp, double *dd) |
| 748 | #endif |
| 749 | { |
| 750 | #ifdef Sudden_Underflow |
| 751 | @@ -57,7 +57,7 @@ |
| 752 | #define fpi &fpi0 |
| 753 | #endif |
| 754 | |
| 755 | - rv = strtodg(s, sp, fpi, &exp, bits); |
| 756 | + rv = gdtoa__strtodg(s, sp, fpi, &exp, bits); |
| 757 | u = (U*)dd; |
| 758 | switch(rv & STRTOG_Retmask) { |
| 759 | case STRTOG_NoNumber: |
| 760 | diff -Naur gdtoa.1/strtopf.c gdtoa.2/strtopf.c |
| 761 | --- gdtoa.1/strtopf.c 2016-02-19 04:41:58.000000000 +0000 |
| 762 | +++ gdtoa.2/strtopf.c 2018-01-25 20:50:09.000000000 +0000 |
| 763 | @@ -33,9 +33,9 @@ |
| 764 | |
| 765 | int |
| 766 | #ifdef KR_headers |
| 767 | -strtopf(s, sp, f) CONST char *s; char **sp; float *f; |
| 768 | +gdtoa__strtopf(s, sp, f) CONST char *s; char **sp; float *f; |
| 769 | #else |
| 770 | -strtopf(CONST char *s, char **sp, float *f) |
| 771 | +gdtoa__strtopf(CONST char *s, char **sp, float *f) |
| 772 | #endif |
| 773 | { |
| 774 | static FPI fpi0 = { 24, 1-127-24+1, 254-127-24+1, 1, SI, 0 /*unused*/ }; |
| 775 | @@ -48,7 +48,7 @@ |
| 776 | #define fpi &fpi0 |
| 777 | #endif |
| 778 | |
| 779 | - k = strtodg(s, sp, fpi, &exp, bits); |
| 780 | + k = gdtoa__strtodg(s, sp, fpi, &exp, bits); |
| 781 | L = (ULong*)f; |
| 782 | switch(k & STRTOG_Retmask) { |
| 783 | case STRTOG_NoNumber: |
| 784 | diff -Naur gdtoa.1/strtopx.c gdtoa.2/strtopx.c |
| 785 | --- gdtoa.1/strtopx.c 2016-02-19 04:43:54.000000000 +0000 |
| 786 | +++ gdtoa.2/strtopx.c 2018-01-25 20:50:09.000000000 +0000 |
| 787 | @@ -55,9 +55,9 @@ |
| 788 | |
| 789 | int |
| 790 | #ifdef KR_headers |
| 791 | -strtopx(s, sp, V) CONST char *s; char **sp; void *V; |
| 792 | +gdtoa__strtopx(s, sp, V) CONST char *s; char **sp; void *V; |
| 793 | #else |
| 794 | -strtopx(CONST char *s, char **sp, void *V) |
| 795 | +gdtoa__strtopx(CONST char *s, char **sp, void *V) |
| 796 | #endif |
| 797 | { |
| 798 | static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI, 0 /*unused*/ }; |
| 799 | @@ -71,7 +71,7 @@ |
| 800 | #define fpi &fpi0 |
| 801 | #endif |
| 802 | |
| 803 | - k = strtodg(s, sp, fpi, &exp, bits); |
| 804 | + k = gdtoa__strtodg(s, sp, fpi, &exp, bits); |
| 805 | switch(k & STRTOG_Retmask) { |
| 806 | case STRTOG_NoNumber: |
| 807 | case STRTOG_Zero: |
| 808 | diff -Naur gdtoa.1/strtopxL.c gdtoa.2/strtopxL.c |
| 809 | --- gdtoa.1/strtopxL.c 2016-02-19 04:48:39.000000000 +0000 |
| 810 | +++ gdtoa.2/strtopxL.c 2018-01-25 20:50:09.000000000 +0000 |
| 811 | @@ -51,9 +51,9 @@ |
| 812 | |
| 813 | int |
| 814 | #ifdef KR_headers |
| 815 | -strtopxL(s, sp, V) CONST char *s; char **sp; void *V; |
| 816 | +gdtoa__strtopxL(s, sp, V) CONST char *s; char **sp; void *V; |
| 817 | #else |
| 818 | -strtopxL(CONST char *s, char **sp, void *V) |
| 819 | +gdtoa__strtopxL(CONST char *s, char **sp, void *V) |
| 820 | #endif |
| 821 | { |
| 822 | static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI, 0 /*unused*/ }; |
| 823 | @@ -67,7 +67,7 @@ |
| 824 | #define fpi &fpi0 |
| 825 | #endif |
| 826 | |
| 827 | - k = strtodg(s, sp, fpi, &exp, bits); |
| 828 | + k = gdtoa__strtodg(s, sp, fpi, &exp, bits); |
| 829 | switch(k & STRTOG_Retmask) { |
| 830 | case STRTOG_NoNumber: |
| 831 | case STRTOG_Zero: |
| 832 | diff -Naur gdtoa.1/strtorQ.c gdtoa.2/strtorQ.c |
| 833 | --- gdtoa.1/strtorQ.c 2016-02-19 04:48:39.000000000 +0000 |
| 834 | +++ gdtoa.2/strtorQ.c 2018-01-25 20:50:09.000000000 +0000 |
| 835 | @@ -96,9 +96,9 @@ |
| 836 | |
| 837 | int |
| 838 | #ifdef KR_headers |
| 839 | -strtorQ(s, sp, rounding, L) CONST char *s; char **sp; int rounding; void *L; |
| 840 | +gdtoa__strtorQ(s, sp, rounding, L) CONST char *s; char **sp; int rounding; void *L; |
| 841 | #else |
| 842 | -strtorQ(CONST char *s, char **sp, int rounding, void *L) |
| 843 | +gdtoa__strtorQ(CONST char *s, char **sp, int rounding, void *L) |
| 844 | #endif |
| 845 | { |
| 846 | static FPI fpi0 = { 113, 1-16383-113+1, 32766-16383-113+1, 1, SI, 0 /*unused*/ }; |
| 847 | @@ -113,7 +113,7 @@ |
| 848 | fpi1.rounding = rounding; |
| 849 | fpi = &fpi1; |
| 850 | } |
| 851 | - k = strtodg(s, sp, fpi, &exp, bits); |
| 852 | + k = gdtoa__strtodg(s, sp, fpi, &exp, bits); |
| 853 | ULtoQ((ULong*)L, bits, exp, k); |
| 854 | return k; |
| 855 | } |
| 856 | diff -Naur gdtoa.1/strtord.c gdtoa.2/strtord.c |
| 857 | --- gdtoa.1/strtord.c 2016-02-19 04:48:39.000000000 +0000 |
| 858 | +++ gdtoa.2/strtord.c 2018-01-25 20:50:09.000000000 +0000 |
| 859 | @@ -72,9 +72,9 @@ |
| 860 | |
| 861 | int |
| 862 | #ifdef KR_headers |
| 863 | -strtord(s, sp, rounding, d) CONST char *s; char **sp; int rounding; double *d; |
| 864 | +gdtoa__strtord(s, sp, rounding, d) CONST char *s; char **sp; int rounding; double *d; |
| 865 | #else |
| 866 | -strtord(CONST char *s, char **sp, int rounding, double *d) |
| 867 | +gdtoa__strtord(CONST char *s, char **sp, int rounding, double *d) |
| 868 | #endif |
| 869 | { |
| 870 | static FPI fpi0 = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI, 0 /*unused*/ }; |
| 871 | @@ -89,7 +89,7 @@ |
| 872 | fpi1.rounding = rounding; |
| 873 | fpi = &fpi1; |
| 874 | } |
| 875 | - k = strtodg(s, sp, fpi, &exp, bits); |
| 876 | + k = gdtoa__strtodg(s, sp, fpi, &exp, bits); |
| 877 | ULtod((ULong*)d, bits, exp, k); |
| 878 | return k; |
| 879 | } |
| 880 | diff -Naur gdtoa.1/strtordd.c gdtoa.2/strtordd.c |
| 881 | --- gdtoa.1/strtordd.c 2016-02-19 04:48:39.000000000 +0000 |
| 882 | +++ gdtoa.2/strtordd.c 2018-01-25 20:50:09.000000000 +0000 |
| 883 | @@ -175,9 +175,9 @@ |
| 884 | |
| 885 | int |
| 886 | #ifdef KR_headers |
| 887 | -strtordd(s, sp, rounding, dd) CONST char *s; char **sp; int rounding; double *dd; |
| 888 | +gdtoa__strtordd(s, sp, rounding, dd) CONST char *s; char **sp; int rounding; double *dd; |
| 889 | #else |
| 890 | -strtordd(CONST char *s, char **sp, int rounding, double *dd) |
| 891 | +gdtoa__strtordd(CONST char *s, char **sp, int rounding, double *dd) |
| 892 | #endif |
| 893 | { |
| 894 | #ifdef Sudden_Underflow |
| 895 | @@ -196,7 +196,7 @@ |
| 896 | fpi1.rounding = rounding; |
| 897 | fpi = &fpi1; |
| 898 | } |
| 899 | - k = strtodg(s, sp, fpi, &exp, bits); |
| 900 | + k = gdtoa__strtodg(s, sp, fpi, &exp, bits); |
| 901 | ULtodd((ULong*)dd, bits, exp, k); |
| 902 | return k; |
| 903 | } |
| 904 | diff -Naur gdtoa.1/strtorf.c gdtoa.2/strtorf.c |
| 905 | --- gdtoa.1/strtorf.c 2016-02-19 04:48:39.000000000 +0000 |
| 906 | +++ gdtoa.2/strtorf.c 2018-01-25 20:50:09.000000000 +0000 |
| 907 | @@ -68,9 +68,9 @@ |
| 908 | |
| 909 | int |
| 910 | #ifdef KR_headers |
| 911 | -strtorf(s, sp, rounding, f) CONST char *s; char **sp; int rounding; float *f; |
| 912 | +gdtoa__strtorf(s, sp, rounding, f) CONST char *s; char **sp; int rounding; float *f; |
| 913 | #else |
| 914 | -strtorf(CONST char *s, char **sp, int rounding, float *f) |
| 915 | +gdtoa__strtorf(CONST char *s, char **sp, int rounding, float *f) |
| 916 | #endif |
| 917 | { |
| 918 | static FPI fpi0 = { 24, 1-127-24+1, 254-127-24+1, 1, SI, 0 /*unused*/ }; |
| 919 | @@ -85,7 +85,7 @@ |
| 920 | fpi1.rounding = rounding; |
| 921 | fpi = &fpi1; |
| 922 | } |
| 923 | - k = strtodg(s, sp, fpi, &exp, bits); |
| 924 | + k = gdtoa__strtodg(s, sp, fpi, &exp, bits); |
| 925 | ULtof((ULong*)f, bits, exp, k); |
| 926 | return k; |
| 927 | } |
| 928 | diff -Naur gdtoa.1/strtorx.c gdtoa.2/strtorx.c |
| 929 | --- gdtoa.1/strtorx.c 2016-02-19 04:48:39.000000000 +0000 |
| 930 | +++ gdtoa.2/strtorx.c 2018-01-25 20:50:09.000000000 +0000 |
| 931 | @@ -99,9 +99,9 @@ |
| 932 | |
| 933 | int |
| 934 | #ifdef KR_headers |
| 935 | -strtorx(s, sp, rounding, L) CONST char *s; char **sp; int rounding; void *L; |
| 936 | +gdtoa__strtorx(s, sp, rounding, L) CONST char *s; char **sp; int rounding; void *L; |
| 937 | #else |
| 938 | -strtorx(CONST char *s, char **sp, int rounding, void *L) |
| 939 | +gdtoa__strtorx(CONST char *s, char **sp, int rounding, void *L) |
| 940 | #endif |
| 941 | { |
| 942 | static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI, 0 /*unused*/ }; |
| 943 | @@ -116,7 +116,7 @@ |
| 944 | fpi1.rounding = rounding; |
| 945 | fpi = &fpi1; |
| 946 | } |
| 947 | - k = strtodg(s, sp, fpi, &exp, bits); |
| 948 | + k = gdtoa__strtodg(s, sp, fpi, &exp, bits); |
| 949 | ULtox((UShort*)L, bits, exp, k); |
| 950 | return k; |
| 951 | } |
| 952 | diff -Naur gdtoa.1/strtorxL.c gdtoa.2/strtorxL.c |
| 953 | --- gdtoa.1/strtorxL.c 2016-02-19 04:48:39.000000000 +0000 |
| 954 | +++ gdtoa.2/strtorxL.c 2018-01-25 20:50:09.000000000 +0000 |
| 955 | @@ -87,9 +87,9 @@ |
| 956 | |
| 957 | int |
| 958 | #ifdef KR_headers |
| 959 | -strtorxL(s, sp, rounding, L) CONST char *s; char **sp; int rounding; void *L; |
| 960 | +gdtoa__strtorxL(s, sp, rounding, L) CONST char *s; char **sp; int rounding; void *L; |
| 961 | #else |
| 962 | -strtorxL(CONST char *s, char **sp, int rounding, void *L) |
| 963 | +gdtoa__strtorxL(CONST char *s, char **sp, int rounding, void *L) |
| 964 | #endif |
| 965 | { |
| 966 | static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI, 0 /*unused*/ }; |
| 967 | @@ -104,7 +104,7 @@ |
| 968 | fpi1.rounding = rounding; |
| 969 | fpi = &fpi1; |
| 970 | } |
| 971 | - k = strtodg(s, sp, fpi, &exp, bits); |
| 972 | + k = gdtoa__strtodg(s, sp, fpi, &exp, bits); |
| 973 | ULtoxL((ULong*)L, bits, exp, k); |
| 974 | return k; |
| 975 | } |