[6c613c4] | 1 | Submitted By: William Harrington kb0iic at cross-lfs dot org. |
---|
| 2 | Date: 2013-08-12 |
---|
| 3 | Initial Package Version: 2.17 |
---|
| 4 | Upstream Status: Applied to 2.18 |
---|
| 5 | Origin: http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4220c3ef773c0e7fff7c95ecd7cff69886fe4c0e |
---|
| 6 | Description: Fixes a mismatch of guards around qcvt and friends. |
---|
| 7 | |
---|
| 8 | Redone for eglibc-2.17 on 2013-08-12 |
---|
| 9 | |
---|
| 10 | diff -Naur eglibc-2.17.orig/stdlib/bits/stdlib-ldbl.h eglibc-2.17/stdlib/bits/stdlib-ldbl.h |
---|
| 11 | --- eglibc-2.17.orig/stdlib/bits/stdlib-ldbl.h 2012-02-18 02:24:59.000000000 +0000 |
---|
| 12 | +++ eglibc-2.17/stdlib/bits/stdlib-ldbl.h 2013-08-11 22:09:07.000000000 +0000 |
---|
| 13 | @@ -30,12 +30,10 @@ |
---|
| 14 | __LDBL_REDIR1_DECL (strtold_l, strtod_l) |
---|
| 15 | #endif |
---|
| 16 | |
---|
| 17 | -#if defined __USE_SVID || defined __USE_XOPEN_EXTENDED |
---|
| 18 | -# ifdef __USE_MISC |
---|
| 19 | +#ifdef __USE_MISC |
---|
| 20 | __LDBL_REDIR1_DECL (qecvt, ecvt) |
---|
| 21 | __LDBL_REDIR1_DECL (qfcvt, fcvt) |
---|
| 22 | __LDBL_REDIR1_DECL (qgcvt, gcvt) |
---|
| 23 | __LDBL_REDIR1_DECL (qecvt_r, ecvt_r) |
---|
| 24 | __LDBL_REDIR1_DECL (qfcvt_r, fcvt_r) |
---|
| 25 | -# endif |
---|
| 26 | #endif |
---|
| 27 | diff -Naur eglibc-2.17.orig/stdlib/stdlib.h eglibc-2.17/stdlib/stdlib.h |
---|
| 28 | --- eglibc-2.17.orig/stdlib/stdlib.h 2012-11-09 22:50:35.000000000 +0000 |
---|
| 29 | +++ eglibc-2.17/stdlib/stdlib.h 2013-08-11 22:06:29.000000000 +0000 |
---|
| 30 | @@ -819,8 +819,9 @@ |
---|
| 31 | extern char *gcvt (double __value, int __ndigit, char *__buf) |
---|
| 32 | __THROW __nonnull ((3)) __wur; |
---|
| 33 | |
---|
| 34 | +#endif |
---|
| 35 | |
---|
| 36 | -# ifdef __USE_MISC |
---|
| 37 | +#ifdef __USE_MISC |
---|
| 38 | /* Long double versions of above functions. */ |
---|
| 39 | extern char *qecvt (long double __value, int __ndigit, |
---|
| 40 | int *__restrict __decpt, int *__restrict __sign) |
---|
| 41 | @@ -849,9 +850,7 @@ |
---|
| 42 | int *__restrict __decpt, int *__restrict __sign, |
---|
| 43 | char *__restrict __buf, size_t __len) |
---|
| 44 | __THROW __nonnull ((3, 4, 5)); |
---|
| 45 | -# endif /* misc */ |
---|
| 46 | -#endif /* use MISC || use X/Open Unix */ |
---|
| 47 | - |
---|
| 48 | +#endif /* misc */ |
---|
| 49 | |
---|
| 50 | __BEGIN_NAMESPACE_STD |
---|
| 51 | /* Return the length of the multibyte character |
---|