yann@1249
|
1 |
diff -Naurd mpfr-2.4.0-a/PATCHES mpfr-2.4.0-b/PATCHES
|
yann@1249
|
2 |
--- mpfr-2.4.0-a/PATCHES 2009-01-26 12:52:01.000000000 +0000
|
yann@1249
|
3 |
+++ mpfr-2.4.0-b/PATCHES 2009-02-20 17:27:44.000000000 +0000
|
yann@1249
|
4 |
@@ -0,0 +1 @@
|
yann@1249
|
5 |
+printf-hh-ll
|
yann@1249
|
6 |
diff -Naurd mpfr-2.4.0-a/VERSION mpfr-2.4.0-b/VERSION
|
yann@1249
|
7 |
--- mpfr-2.4.0-a/VERSION 2009-01-26 12:52:01.000000000 +0000
|
yann@1249
|
8 |
+++ mpfr-2.4.0-b/VERSION 2009-02-20 17:27:44.000000000 +0000
|
yann@1249
|
9 |
@@ -1 +1 @@
|
yann@1249
|
10 |
-2.4.0
|
yann@1249
|
11 |
+2.4.0-p1
|
yann@1249
|
12 |
diff -Naurd mpfr-2.4.0-a/acinclude.m4 mpfr-2.4.0-b/acinclude.m4
|
yann@1249
|
13 |
--- mpfr-2.4.0-a/acinclude.m4 2009-01-26 12:52:01.000000000 +0000
|
yann@1249
|
14 |
+++ mpfr-2.4.0-b/acinclude.m4 2009-01-26 12:52:01.000000000 +0000
|
yann@1249
|
15 |
@@ -722,6 +722,16 @@
|
yann@1249
|
16 |
[AC_DEFINE([NPRINTF_J], 1, [gmp_printf cannot read intmax_t])])
|
yann@1249
|
17 |
fi
|
yann@1249
|
18 |
|
yann@1249
|
19 |
+MPFR_FUNC_PRINTF_SPEC([%hhd], [char], [
|
yann@1249
|
20 |
+#include <gmp.h>
|
yann@1249
|
21 |
+ ], [gmp_],,
|
yann@1249
|
22 |
+ [AC_DEFINE([NPRINTF_HH], 1, [gmp_printf cannot use 'hh' length modifier])])
|
yann@1249
|
23 |
+
|
yann@1249
|
24 |
+MPFR_FUNC_PRINTF_SPEC([%lld], [long long int], [
|
yann@1249
|
25 |
+#include <gmp.h>
|
yann@1249
|
26 |
+ ], [gmp_],,
|
yann@1249
|
27 |
+ [AC_DEFINE([NPRINTF_LL], 1, [gmp_printf cannot read long long int])])
|
yann@1249
|
28 |
+
|
yann@1249
|
29 |
MPFR_FUNC_PRINTF_SPEC([%.0Lf], [long double], [
|
yann@1249
|
30 |
#include <gmp.h>
|
yann@1249
|
31 |
], [gmp_],,
|
yann@1249
|
32 |
diff -Naurd mpfr-2.4.0-a/configure mpfr-2.4.0-b/configure
|
yann@1249
|
33 |
--- mpfr-2.4.0-a/configure 2009-01-26 12:54:36.000000000 +0000
|
yann@1249
|
34 |
+++ mpfr-2.4.0-b/configure 2009-02-20 17:38:36.000000000 +0000
|
yann@1249
|
35 |
@@ -24874,6 +24874,170 @@
|
yann@1249
|
36 |
fi
|
yann@1249
|
37 |
|
yann@1249
|
38 |
|
yann@1249
|
39 |
+{ $as_echo "$as_me:$LINENO: checking if gmp_printf supports \"%hhd\"" >&5
|
yann@1249
|
40 |
+$as_echo_n "checking if gmp_printf supports \"%hhd\"... " >&6; }
|
yann@1249
|
41 |
+if test "$cross_compiling" = yes; then
|
yann@1249
|
42 |
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
yann@1249
|
43 |
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
yann@1249
|
44 |
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
|
yann@1249
|
45 |
+See \`config.log' for more details." >&5
|
yann@1249
|
46 |
+$as_echo "$as_me: error: cannot run test program while cross compiling
|
yann@1249
|
47 |
+See \`config.log' for more details." >&2;}
|
yann@1249
|
48 |
+ { (exit 1); exit 1; }; }; }
|
yann@1249
|
49 |
+else
|
yann@1249
|
50 |
+ cat >conftest.$ac_ext <<_ACEOF
|
yann@1249
|
51 |
+/* confdefs.h. */
|
yann@1249
|
52 |
+_ACEOF
|
yann@1249
|
53 |
+cat confdefs.h >>conftest.$ac_ext
|
yann@1249
|
54 |
+cat >>conftest.$ac_ext <<_ACEOF
|
yann@1249
|
55 |
+/* end confdefs.h. */
|
yann@1249
|
56 |
+
|
yann@1249
|
57 |
+#include <stdio.h>
|
yann@1249
|
58 |
+
|
yann@1249
|
59 |
+#include <gmp.h>
|
yann@1249
|
60 |
+
|
yann@1249
|
61 |
+
|
yann@1249
|
62 |
+int
|
yann@1249
|
63 |
+main ()
|
yann@1249
|
64 |
+{
|
yann@1249
|
65 |
+
|
yann@1249
|
66 |
+ char s[256];
|
yann@1249
|
67 |
+ char a = 0;
|
yann@1249
|
68 |
+ return (gmp_sprintf (s, "%hhd", a) != 1) ? 1 : 0;
|
yann@1249
|
69 |
+
|
yann@1249
|
70 |
+ ;
|
yann@1249
|
71 |
+ return 0;
|
yann@1249
|
72 |
+}
|
yann@1249
|
73 |
+_ACEOF
|
yann@1249
|
74 |
+rm -f conftest$ac_exeext
|
yann@1249
|
75 |
+if { (ac_try="$ac_link"
|
yann@1249
|
76 |
+case "(($ac_try" in
|
yann@1249
|
77 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
yann@1249
|
78 |
+ *) ac_try_echo=$ac_try;;
|
yann@1249
|
79 |
+esac
|
yann@1249
|
80 |
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
yann@1249
|
81 |
+$as_echo "$ac_try_echo") >&5
|
yann@1249
|
82 |
+ (eval "$ac_link") 2>&5
|
yann@1249
|
83 |
+ ac_status=$?
|
yann@1249
|
84 |
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
yann@1249
|
85 |
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
yann@1249
|
86 |
+ { (case "(($ac_try" in
|
yann@1249
|
87 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
yann@1249
|
88 |
+ *) ac_try_echo=$ac_try;;
|
yann@1249
|
89 |
+esac
|
yann@1249
|
90 |
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
yann@1249
|
91 |
+$as_echo "$ac_try_echo") >&5
|
yann@1249
|
92 |
+ (eval "$ac_try") 2>&5
|
yann@1249
|
93 |
+ ac_status=$?
|
yann@1249
|
94 |
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
yann@1249
|
95 |
+ (exit $ac_status); }; }; then
|
yann@1249
|
96 |
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
|
yann@1249
|
97 |
+$as_echo "yes" >&6; }
|
yann@1249
|
98 |
+
|
yann@1249
|
99 |
+else
|
yann@1249
|
100 |
+ $as_echo "$as_me: program exited with status $ac_status" >&5
|
yann@1249
|
101 |
+$as_echo "$as_me: failed program was:" >&5
|
yann@1249
|
102 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
yann@1249
|
103 |
+
|
yann@1249
|
104 |
+( exit $ac_status )
|
yann@1249
|
105 |
+{ $as_echo "$as_me:$LINENO: result: no" >&5
|
yann@1249
|
106 |
+$as_echo "no" >&6; }
|
yann@1249
|
107 |
+
|
yann@1249
|
108 |
+cat >>confdefs.h <<\_ACEOF
|
yann@1249
|
109 |
+#define NPRINTF_HH 1
|
yann@1249
|
110 |
+_ACEOF
|
yann@1249
|
111 |
+
|
yann@1249
|
112 |
+fi
|
yann@1249
|
113 |
+rm -rf conftest.dSYM
|
yann@1249
|
114 |
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
yann@1249
|
115 |
+fi
|
yann@1249
|
116 |
+
|
yann@1249
|
117 |
+
|
yann@1249
|
118 |
+
|
yann@1249
|
119 |
+
|
yann@1249
|
120 |
+
|
yann@1249
|
121 |
+{ $as_echo "$as_me:$LINENO: checking if gmp_printf supports \"%lld\"" >&5
|
yann@1249
|
122 |
+$as_echo_n "checking if gmp_printf supports \"%lld\"... " >&6; }
|
yann@1249
|
123 |
+if test "$cross_compiling" = yes; then
|
yann@1249
|
124 |
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
yann@1249
|
125 |
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
yann@1249
|
126 |
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
|
yann@1249
|
127 |
+See \`config.log' for more details." >&5
|
yann@1249
|
128 |
+$as_echo "$as_me: error: cannot run test program while cross compiling
|
yann@1249
|
129 |
+See \`config.log' for more details." >&2;}
|
yann@1249
|
130 |
+ { (exit 1); exit 1; }; }; }
|
yann@1249
|
131 |
+else
|
yann@1249
|
132 |
+ cat >conftest.$ac_ext <<_ACEOF
|
yann@1249
|
133 |
+/* confdefs.h. */
|
yann@1249
|
134 |
+_ACEOF
|
yann@1249
|
135 |
+cat confdefs.h >>conftest.$ac_ext
|
yann@1249
|
136 |
+cat >>conftest.$ac_ext <<_ACEOF
|
yann@1249
|
137 |
+/* end confdefs.h. */
|
yann@1249
|
138 |
+
|
yann@1249
|
139 |
+#include <stdio.h>
|
yann@1249
|
140 |
+
|
yann@1249
|
141 |
+#include <gmp.h>
|
yann@1249
|
142 |
+
|
yann@1249
|
143 |
+
|
yann@1249
|
144 |
+int
|
yann@1249
|
145 |
+main ()
|
yann@1249
|
146 |
+{
|
yann@1249
|
147 |
+
|
yann@1249
|
148 |
+ char s[256];
|
yann@1249
|
149 |
+ long long int a = 0;
|
yann@1249
|
150 |
+ return (gmp_sprintf (s, "%lld", a) != 1) ? 1 : 0;
|
yann@1249
|
151 |
+
|
yann@1249
|
152 |
+ ;
|
yann@1249
|
153 |
+ return 0;
|
yann@1249
|
154 |
+}
|
yann@1249
|
155 |
+_ACEOF
|
yann@1249
|
156 |
+rm -f conftest$ac_exeext
|
yann@1249
|
157 |
+if { (ac_try="$ac_link"
|
yann@1249
|
158 |
+case "(($ac_try" in
|
yann@1249
|
159 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
yann@1249
|
160 |
+ *) ac_try_echo=$ac_try;;
|
yann@1249
|
161 |
+esac
|
yann@1249
|
162 |
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
yann@1249
|
163 |
+$as_echo "$ac_try_echo") >&5
|
yann@1249
|
164 |
+ (eval "$ac_link") 2>&5
|
yann@1249
|
165 |
+ ac_status=$?
|
yann@1249
|
166 |
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
yann@1249
|
167 |
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
yann@1249
|
168 |
+ { (case "(($ac_try" in
|
yann@1249
|
169 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
yann@1249
|
170 |
+ *) ac_try_echo=$ac_try;;
|
yann@1249
|
171 |
+esac
|
yann@1249
|
172 |
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
yann@1249
|
173 |
+$as_echo "$ac_try_echo") >&5
|
yann@1249
|
174 |
+ (eval "$ac_try") 2>&5
|
yann@1249
|
175 |
+ ac_status=$?
|
yann@1249
|
176 |
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
yann@1249
|
177 |
+ (exit $ac_status); }; }; then
|
yann@1249
|
178 |
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
|
yann@1249
|
179 |
+$as_echo "yes" >&6; }
|
yann@1249
|
180 |
+
|
yann@1249
|
181 |
+else
|
yann@1249
|
182 |
+ $as_echo "$as_me: program exited with status $ac_status" >&5
|
yann@1249
|
183 |
+$as_echo "$as_me: failed program was:" >&5
|
yann@1249
|
184 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
yann@1249
|
185 |
+
|
yann@1249
|
186 |
+( exit $ac_status )
|
yann@1249
|
187 |
+{ $as_echo "$as_me:$LINENO: result: no" >&5
|
yann@1249
|
188 |
+$as_echo "no" >&6; }
|
yann@1249
|
189 |
+
|
yann@1249
|
190 |
+cat >>confdefs.h <<\_ACEOF
|
yann@1249
|
191 |
+#define NPRINTF_LL 1
|
yann@1249
|
192 |
+_ACEOF
|
yann@1249
|
193 |
+
|
yann@1249
|
194 |
+fi
|
yann@1249
|
195 |
+rm -rf conftest.dSYM
|
yann@1249
|
196 |
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
yann@1249
|
197 |
+fi
|
yann@1249
|
198 |
+
|
yann@1249
|
199 |
+
|
yann@1249
|
200 |
+
|
yann@1249
|
201 |
+
|
yann@1249
|
202 |
+
|
yann@1249
|
203 |
{ $as_echo "$as_me:$LINENO: checking if gmp_printf supports \"%.0Lf\"" >&5
|
yann@1249
|
204 |
$as_echo_n "checking if gmp_printf supports \"%.0Lf\"... " >&6; }
|
yann@1249
|
205 |
if test "$cross_compiling" = yes; then
|
yann@1249
|
206 |
diff -Naurd mpfr-2.4.0-a/mpfr.h mpfr-2.4.0-b/mpfr.h
|
yann@1249
|
207 |
--- mpfr-2.4.0-a/mpfr.h 2009-01-26 12:52:01.000000000 +0000
|
yann@1249
|
208 |
+++ mpfr-2.4.0-b/mpfr.h 2009-02-20 17:27:44.000000000 +0000
|
yann@1249
|
209 |
@@ -27,7 +27,7 @@
|
yann@1249
|
210 |
#define MPFR_VERSION_MAJOR 2
|
yann@1249
|
211 |
#define MPFR_VERSION_MINOR 4
|
yann@1249
|
212 |
#define MPFR_VERSION_PATCHLEVEL 0
|
yann@1249
|
213 |
-#define MPFR_VERSION_STRING "2.4.0"
|
yann@1249
|
214 |
+#define MPFR_VERSION_STRING "2.4.0-p1"
|
yann@1249
|
215 |
|
yann@1249
|
216 |
/* Macros dealing with MPFR VERSION */
|
yann@1249
|
217 |
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
yann@1249
|
218 |
diff -Naurd mpfr-2.4.0-a/tests/tfprintf.c mpfr-2.4.0-b/tests/tfprintf.c
|
yann@1249
|
219 |
--- mpfr-2.4.0-a/tests/tfprintf.c 2009-01-26 12:52:00.000000000 +0000
|
yann@1249
|
220 |
+++ mpfr-2.4.0-b/tests/tfprintf.c 2009-02-20 16:31:02.000000000 +0000
|
yann@1249
|
221 |
@@ -146,6 +146,7 @@
|
yann@1249
|
222 |
short sh = -1;
|
yann@1249
|
223 |
unsigned short ush = 1;
|
yann@1249
|
224 |
int i = -1;
|
yann@1249
|
225 |
+ int j = 1;
|
yann@1249
|
226 |
unsigned int ui = 1;
|
yann@1249
|
227 |
long lo = -1;
|
yann@1249
|
228 |
unsigned long ulo = 1;
|
yann@1249
|
229 |
@@ -179,12 +180,11 @@
|
yann@1249
|
230 |
|
yann@1249
|
231 |
limb[0] = limb[1] = limb[2] = ~ (mp_limb_t) 0;
|
yann@1249
|
232 |
|
yann@1249
|
233 |
- check_vfprintf (fout, "a. %Ra, b. %hhu, c. %u, d. %lx%hhn", mpfr, uch, ui,
|
yann@1249
|
234 |
- ulo, &uch);
|
yann@1249
|
235 |
- check_length (1, uch, 28, hhu);
|
yann@1249
|
236 |
- check_vfprintf (fout, "a. %hhi, b. %Rb, c. %u, d. %li%ln", sch, mpfr, i,
|
yann@1249
|
237 |
+ check_vfprintf (fout, "a. %Ra, b. %u, c. %lx%n", mpfr, ui, ulo, &j);
|
yann@1249
|
238 |
+ check_length (1, j, 22, d);
|
yann@1249
|
239 |
+ check_vfprintf (fout, "a. %c, b. %Rb, c. %u, d. %li%ln", i, mpfr, i,
|
yann@1249
|
240 |
lo, &ulo);
|
yann@1249
|
241 |
- check_length (2, ulo, 37, lu);
|
yann@1249
|
242 |
+ check_length (2, ulo, 36, lu);
|
yann@1249
|
243 |
check_vfprintf (fout, "a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush);
|
yann@1249
|
244 |
check_length (3, ush, 29, hu);
|
yann@1249
|
245 |
check_vfprintf (fout, "a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i);
|
yann@1249
|
246 |
@@ -208,13 +208,18 @@
|
yann@1249
|
247 |
check_length (9, sz, 30, zu);
|
yann@1249
|
248 |
#endif
|
yann@1249
|
249 |
|
yann@1249
|
250 |
+#ifndef NPRINTF_HH
|
yann@1249
|
251 |
+ check_vfprintf (fout, "a. %hhi, b.%RA, c. %hhu%hhn", sch, mpfr, uch, &uch);
|
yann@1249
|
252 |
+ check_length (10, uch, 21, hhu);
|
yann@1249
|
253 |
+#endif
|
yann@1249
|
254 |
+
|
yann@1249
|
255 |
#if (__GNU_MP_VERSION * 10 + __GNU_MP_VERSION_MINOR) >= 42
|
yann@1249
|
256 |
/* The 'M' specifier was added in gmp 4.2.0 */
|
yann@1249
|
257 |
check_vfprintf (fout, "a. %Mx b. %Re%Mn", limb[0], mpfr, &limb[0]);
|
yann@1249
|
258 |
if (limb[0] != 14 + BITS_PER_MP_LIMB / 4 || limb[1] != ~ (mp_limb_t) 0
|
yann@1249
|
259 |
|| limb[2] != ~ (mp_limb_t) 0)
|
yann@1249
|
260 |
{
|
yann@1249
|
261 |
- printf ("Error in test #10: mpfr_vfprintf did not print %d characters"
|
yann@1249
|
262 |
+ printf ("Error in test #11: mpfr_vfprintf did not print %d characters"
|
yann@1249
|
263 |
" as expected\n", 14 + (int) BITS_PER_MP_LIMB / 4);
|
yann@1249
|
264 |
exit (1);
|
yann@1249
|
265 |
}
|
yann@1249
|
266 |
@@ -227,13 +232,13 @@
|
yann@1249
|
267 |
if (limb[0] != 14 + 3 * BITS_PER_MP_LIMB / 4 || limb[1] != (mp_limb_t) 0
|
yann@1249
|
268 |
|| limb[2] != ~ (mp_limb_t) 0)
|
yann@1249
|
269 |
{
|
yann@1249
|
270 |
- printf ("Error in test #11: mpfr_vfprintf did not print %d characters"
|
yann@1249
|
271 |
+ printf ("Error in test #12: mpfr_vfprintf did not print %d characters"
|
yann@1249
|
272 |
" as expected\n", 14 + (int) BITS_PER_MP_LIMB / 4);
|
yann@1249
|
273 |
exit (1);
|
yann@1249
|
274 |
}
|
yann@1249
|
275 |
#endif
|
yann@1249
|
276 |
|
yann@1249
|
277 |
-#ifdef HAVE_LONG_LONG
|
yann@1249
|
278 |
+#if defined(HAVE_LONG_LONG) && !defined(NPRINTF_LL)
|
yann@1249
|
279 |
{
|
yann@1249
|
280 |
long long llo = -1;
|
yann@1249
|
281 |
unsigned long long ullo = 1;
|
yann@1249
|
282 |
diff -Naurd mpfr-2.4.0-a/tests/tprintf.c mpfr-2.4.0-b/tests/tprintf.c
|
yann@1249
|
283 |
--- mpfr-2.4.0-a/tests/tprintf.c 2009-01-26 12:52:00.000000000 +0000
|
yann@1249
|
284 |
+++ mpfr-2.4.0-b/tests/tprintf.c 2009-02-20 16:31:02.000000000 +0000
|
yann@1249
|
285 |
@@ -150,6 +150,7 @@
|
yann@1249
|
286 |
short sh = -1;
|
yann@1249
|
287 |
unsigned short ush = 1;
|
yann@1249
|
288 |
int i = -1;
|
yann@1249
|
289 |
+ int j = 1;
|
yann@1249
|
290 |
unsigned int ui = 1;
|
yann@1249
|
291 |
long lo = -1;
|
yann@1249
|
292 |
unsigned long ulo = 1;
|
yann@1249
|
293 |
@@ -178,11 +179,10 @@
|
yann@1249
|
294 |
mpfr_set_f (mpfr, mpf, GMP_RNDN);
|
yann@1249
|
295 |
prec = mpfr_get_prec (mpfr);
|
yann@1249
|
296 |
|
yann@1249
|
297 |
- check_vprintf ("a. %Ra, b. %hhu, c. %u, d. %lx%hhn", mpfr, uch, ui, ulo,
|
yann@1249
|
298 |
- &uch);
|
yann@1249
|
299 |
- check_length (1, uch, 28, hhu);
|
yann@1249
|
300 |
- check_vprintf ("a. %hhi, b. %Rb, c. %u, d. %li%ln", sch, mpfr, i, lo, &ulo);
|
yann@1249
|
301 |
- check_length (2, ulo, 37, lu);
|
yann@1249
|
302 |
+ check_vprintf ("a. %Ra, b. %u, c. %lx%n", mpfr, ui, ulo, &j);
|
yann@1249
|
303 |
+ check_length (1, j, 22, d);
|
yann@1249
|
304 |
+ check_vprintf ("a. %c, b. %Rb, c. %u, d. %li%ln", i, mpfr, i, lo, &ulo);
|
yann@1249
|
305 |
+ check_length (2, ulo, 36, lu);
|
yann@1249
|
306 |
check_vprintf ("a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush);
|
yann@1249
|
307 |
check_length (3, ush, 29, hu);
|
yann@1249
|
308 |
check_vprintf ("a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i);
|
yann@1249
|
309 |
@@ -204,7 +204,12 @@
|
yann@1249
|
310 |
check_length (9, sz, 30, zu);
|
yann@1249
|
311 |
#endif
|
yann@1249
|
312 |
|
yann@1249
|
313 |
-#ifdef HAVE_LONG_LONG
|
yann@1249
|
314 |
+#ifndef NPRINTF_HH
|
yann@1249
|
315 |
+ check_vprintf ("a. %hhi, b. %Ra, c. %hhu%hhn", sch, mpfr, uch, &uch);
|
yann@1249
|
316 |
+ check_length (10, uch, 22, hhu);
|
yann@1249
|
317 |
+#endif
|
yann@1249
|
318 |
+
|
yann@1249
|
319 |
+#if defined(HAVE_LONG_LONG) && !defined(NPRINTF_LL)
|
yann@1249
|
320 |
{
|
yann@1249
|
321 |
long long llo = -1;
|
yann@1249
|
322 |
unsigned long long ullo = 1;
|
yann@1249
|
323 |
diff -Naurd mpfr-2.4.0-a/vasprintf.c mpfr-2.4.0-b/vasprintf.c
|
yann@1249
|
324 |
--- mpfr-2.4.0-a/vasprintf.c 2009-01-26 12:52:01.000000000 +0000
|
yann@1249
|
325 |
+++ mpfr-2.4.0-b/vasprintf.c 2009-02-20 16:31:02.000000000 +0000
|
yann@1249
|
326 |
@@ -235,10 +235,14 @@
|
yann@1249
|
327 |
break;
|
yann@1249
|
328 |
case 'h':
|
yann@1249
|
329 |
if (*++format == 'h')
|
yann@1249
|
330 |
+#ifndef NPRINTF_HH
|
yann@1249
|
331 |
{
|
yann@1249
|
332 |
++format;
|
yann@1249
|
333 |
specinfo->arg_type = CHAR_ARG;
|
yann@1249
|
334 |
}
|
yann@1249
|
335 |
+#else
|
yann@1249
|
336 |
+ specinfo->arg_type = UNSUPPORTED;
|
yann@1249
|
337 |
+#endif
|
yann@1249
|
338 |
else
|
yann@1249
|
339 |
specinfo->arg_type = SHORT_ARG;
|
yann@1249
|
340 |
break;
|
yann@1249
|
341 |
@@ -246,7 +250,7 @@
|
yann@1249
|
342 |
if (*++format == 'l')
|
yann@1249
|
343 |
{
|
yann@1249
|
344 |
++format;
|
yann@1249
|
345 |
-#ifdef HAVE_LONG_LONG
|
yann@1249
|
346 |
+#if defined (HAVE_LONG_LONG) && !defined(NPRINTF_LL)
|
yann@1249
|
347 |
specinfo->arg_type = LONG_LONG_ARG;
|
yann@1249
|
348 |
#else
|
yann@1249
|
349 |
specinfo->arg_type = UNSUPPORTED;
|
yann@1249
|
350 |
diff -Naurd mpfr-2.4.0-a/version.c mpfr-2.4.0-b/version.c
|
yann@1249
|
351 |
--- mpfr-2.4.0-a/version.c 2009-01-26 12:52:01.000000000 +0000
|
yann@1249
|
352 |
+++ mpfr-2.4.0-b/version.c 2009-02-20 17:27:44.000000000 +0000
|
yann@1249
|
353 |
@@ -25,5 +25,5 @@
|
yann@1249
|
354 |
const char *
|
yann@1249
|
355 |
mpfr_get_version (void)
|
yann@1249
|
356 |
{
|
yann@1249
|
357 |
- return "2.4.0";
|
yann@1249
|
358 |
+ return "2.4.0-p1";
|
yann@1249
|
359 |
}
|