diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-04-28 15:21:50 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-04-28 15:21:50 +0000 |
| commit | c19459a92177fc8864b461e84d017a21c4006dc5 (patch) | |
| tree | fcf20ad0222de01ad3a955edb3b65b06724a3a15 /libc/stdlib/stdlib.h | |
| parent | 8751114637bcc3caaf16a4216da0afb84456558a (diff) | |
| download | eglibc2-c19459a92177fc8864b461e84d017a21c4006dc5.tar.gz | |
Merge changes between r22663 and r22954 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@22955 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/stdlib/stdlib.h')
| -rw-r--r-- | libc/stdlib/stdlib.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libc/stdlib/stdlib.h b/libc/stdlib/stdlib.h index f7a818aa6..99a830dc1 100644 --- a/libc/stdlib/stdlib.h +++ b/libc/stdlib/stdlib.h @@ -823,9 +823,9 @@ extern char *fcvt (double __value, int __ndigit, int *__restrict __decpt, be written to BUF. */ extern char *gcvt (double __value, int __ndigit, char *__buf) __THROW __nonnull ((3)) __wur; +#endif - -# ifdef __USE_MISC +#ifdef __USE_MISC /* Long double versions of above functions. */ extern char *qecvt (long double __value, int __ndigit, int *__restrict __decpt, int *__restrict __sign) @@ -854,21 +854,20 @@ extern int qfcvt_r (long double __value, int __ndigit, int *__restrict __decpt, int *__restrict __sign, char *__restrict __buf, size_t __len) __THROW __nonnull ((3, 4, 5)); -# endif /* misc */ -#endif /* use MISC || use X/Open Unix */ +#endif /* misc */ __BEGIN_NAMESPACE_STD /* Return the length of the multibyte character in S, which is no longer than N. */ -extern int mblen (const char *__s, size_t __n) __THROW __wur; +extern int mblen (const char *__s, size_t __n) __THROW; /* Return the length of the given multibyte character, putting its `wchar_t' representation in *PWC. */ extern int mbtowc (wchar_t *__restrict __pwc, - const char *__restrict __s, size_t __n) __THROW __wur; + const char *__restrict __s, size_t __n) __THROW; /* Put the multibyte character represented by WCHAR in S, returning its length. */ -extern int wctomb (char *__s, wchar_t __wchar) __THROW __wur; +extern int wctomb (char *__s, wchar_t __wchar) __THROW; /* Convert a multibyte string to a wide char string. */ |