diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2005-11-04 22:52:26 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2005-11-04 22:52:26 +0000 |
| commit | 005d20f04dff3665c9533417bdad06d7d208bf9a (patch) | |
| tree | bfe0aa8c46149f67794cd45a4fdb259c57b521cf /include/iconv.h | |
| parent | d8059900ddf188607828b12a174b83decade3d61 (diff) | |
Sync up w/ glibc
Diffstat (limited to 'include/iconv.h')
| -rw-r--r-- | include/iconv.h | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/include/iconv.h b/include/iconv.h index e17360335..0a19c049d 100644 --- a/include/iconv.h +++ b/include/iconv.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999, 2000, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -24,9 +24,10 @@ #include <stddef.h> #ifndef __UCLIBC_HAS_LOCALE__ -#error Attempted to include iconv.h when uClibc built without locale support. +#error Attempted to include iconv.h when uClibc was built without locale support. #endif + __BEGIN_DECLS /* Identifier for conversion method from one codeset to another. */ @@ -34,9 +35,11 @@ typedef void *iconv_t; /* Allocate descriptor for code conversion from codeset FROMCODE to - codeset TOCODE. */ -extern iconv_t iconv_open (__const char *__tocode, __const char *__fromcode) - __THROW; + codeset TOCODE. + + This function is a possible cancellation points and therefore not + marked with __THROW. */ +extern iconv_t iconv_open (__const char *__tocode, __const char *__fromcode); /* Convert at most *INBYTESLEFT bytes from *INBUF according to the code conversion algorithm specified by CD and place up to @@ -46,8 +49,11 @@ extern size_t iconv (iconv_t __cd, char **__restrict __inbuf, char **__restrict __outbuf, size_t *__restrict __outbytesleft); -/* Free resources allocated for descriptor CD for code conversion. */ -extern int iconv_close (iconv_t __cd) __THROW; +/* Free resources allocated for descriptor CD for code conversion. + + This function is a possible cancellation points and therefore not + marked with __THROW. */ +extern int iconv_close (iconv_t __cd); __END_DECLS |