Mercurial > hg > octave-lojdl > gnulib-hg
changeset 11476:d053b39f7091
New include file "iconveh.h".
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 11 Apr 2009 00:01:31 +0200 |
| parents | 3c13040c2619 |
| children | 63b291ae83b6 |
| files | ChangeLog lib/iconveh.h lib/striconveh.h lib/striconveha.h lib/uniconv.h modules/striconveh modules/uniconv/base |
| diffstat | 7 files changed, 63 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2009-04-10 Bruno Haible <bruno@clisp.org> + + New include file "iconveh.h". + * lib/iconveh.h: New file, extracted from lib/striconveh.h. + * lib/striconveh.h: Include it. + (enum iconv_ilseq_handler): Remove definition. + * lib/striconveha.h: Include <stddef.h> and iconveh.h instead of + striconveh.h. + * lib/uniconv.h: Include iconveh.h instead of striconveh.h. + * modules/striconveh (Files): Add lib/iconveh.h. + * modules/uniconv/base (Files): Add lib/iconveh.h. Remove + lib/striconveh.h. + 2009-04-10 Bruno Haible <bruno@clisp.org> * lib/uniconv.h: Update comment.
new file mode 100644 --- /dev/null +++ b/lib/iconveh.h @@ -0,0 +1,41 @@ +/* Character set conversion handler type. + Copyright (C) 2001-2007, 2009 Free Software Foundation, Inc. + Written by Bruno Haible. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef _ICONVEH_H +#define _ICONVEH_H + + +#ifdef __cplusplus +extern "C" { +#endif + + +/* Handling of unconvertible characters. */ +enum iconv_ilseq_handler +{ + iconveh_error, /* return and set errno = EILSEQ */ + iconveh_question_mark, /* use one '?' per unconvertible character */ + iconveh_escape_sequence /* use escape sequence \uxxxx or \Uxxxxxxxx */ +}; + + +#ifdef __cplusplus +} +#endif + + +#endif /* _ICONVEH_H */
--- a/lib/striconveh.h +++ b/lib/striconveh.h @@ -1,5 +1,5 @@ /* Character set conversion with error handling. - Copyright (C) 2001-2007 Free Software Foundation, Inc. + Copyright (C) 2001-2007, 2009 Free Software Foundation, Inc. Written by Bruno Haible and Simon Josefsson. This program is free software: you can redistribute it and/or modify @@ -23,20 +23,14 @@ #include <iconv.h> #endif +#include "iconveh.h" + #ifdef __cplusplus extern "C" { #endif -/* Handling of unconvertible characters. */ -enum iconv_ilseq_handler -{ - iconveh_error, /* return and set errno = EILSEQ */ - iconveh_question_mark, /* use one '?' per unconvertible character */ - iconveh_escape_sequence /* use escape sequence \uxxxx or \Uxxxxxxxx */ -}; - #if HAVE_ICONV /* Convert an entire string from one encoding to another, using iconv.
--- a/lib/striconveha.h +++ b/lib/striconveha.h @@ -1,5 +1,5 @@ /* Character set conversion with error handling and autodetection. - Copyright (C) 2002, 2005, 2007-2008 Free Software Foundation, Inc. + Copyright (C) 2002, 2005, 2007-2009 Free Software Foundation, Inc. Written by Bruno Haible. This program is free software: you can redistribute it and/or modify @@ -19,8 +19,9 @@ #define _STRICONVEHA_H #include <stdbool.h> +#include <stddef.h> -#include "striconveh.h" +#include "iconveh.h" #ifdef __cplusplus
--- a/lib/uniconv.h +++ b/lib/uniconv.h @@ -23,7 +23,7 @@ #include "unitypes.h" /* Get enum iconv_ilseq_handler. */ -#include "striconveh.h" +#include "iconveh.h" /* Get uniconv_register_autodetect() declaration. */ #include "striconveha.h"