mirror of git://sourceware.org/git/glibc.git
iconv: Remove public declaration of __gconv_transliterate
Commit ba7b4d294b
("Complete the
removal of __gconv_translit_find") added a declaration of the
GLIBC_PRIVATE function, __gconv_transliterate, to the installed
header <gconv.h>. It should have been added to the internal
<gconv_int.h> header.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
parent
04b261bdc1
commit
7ac6fad987
|
@ -1,3 +1,10 @@
|
||||||
|
2019-05-15 Florian Weimer <fweimer@redhat.com>
|
||||||
|
|
||||||
|
* iconv/gconv.h (__gconv_transliterate): Move declaration …
|
||||||
|
* iconv/gconv_int.h (__gconv_transliterate): … here.
|
||||||
|
* iconv/loop.c: Include <iconv/gconv_int.h> instead of <gconv.h>.
|
||||||
|
* iconv/skeleton.c: Likewise.
|
||||||
|
|
||||||
2019-05-14 Florian Weimer <fweimer@redhat.com>
|
2019-05-14 Florian Weimer <fweimer@redhat.com>
|
||||||
|
|
||||||
Linux: Add the tgkill function.
|
Linux: Add the tgkill function.
|
||||||
|
|
|
@ -142,13 +142,4 @@ typedef struct __gconv_info
|
||||||
__extension__ struct __gconv_step_data __data[0];
|
__extension__ struct __gconv_step_data __data[0];
|
||||||
} *__gconv_t;
|
} *__gconv_t;
|
||||||
|
|
||||||
/* Transliteration using the locale's data. */
|
|
||||||
extern int __gconv_transliterate (struct __gconv_step *step,
|
|
||||||
struct __gconv_step_data *step_data,
|
|
||||||
const unsigned char *inbufstart,
|
|
||||||
const unsigned char **inbufp,
|
|
||||||
const unsigned char *inbufend,
|
|
||||||
unsigned char **outbufstart,
|
|
||||||
size_t *irreversible);
|
|
||||||
|
|
||||||
#endif /* gconv.h */
|
#endif /* gconv.h */
|
||||||
|
|
|
@ -223,6 +223,14 @@ extern void __gconv_get_builtin_trans (const char *name,
|
||||||
struct __gconv_step *step)
|
struct __gconv_step *step)
|
||||||
attribute_hidden;
|
attribute_hidden;
|
||||||
|
|
||||||
|
/* Transliteration using the locale's data. */
|
||||||
|
extern int __gconv_transliterate (struct __gconv_step *step,
|
||||||
|
struct __gconv_step_data *step_data,
|
||||||
|
const unsigned char *inbufstart,
|
||||||
|
const unsigned char **inbufp,
|
||||||
|
const unsigned char *inbufend,
|
||||||
|
unsigned char **outbufstart,
|
||||||
|
size_t *irreversible);
|
||||||
libc_hidden_proto (__gconv_transliterate)
|
libc_hidden_proto (__gconv_transliterate)
|
||||||
|
|
||||||
/* If NAME is an codeset alias expand it. */
|
/* If NAME is an codeset alias expand it. */
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <endian.h>
|
#include <endian.h>
|
||||||
#include <gconv.h>
|
#include <iconv/gconv_int.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <wchar.h>
|
#include <wchar.h>
|
||||||
|
|
|
@ -133,7 +133,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <gconv.h>
|
#include <iconv/gconv_int.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#define __need_size_t
|
#define __need_size_t
|
||||||
#define __need_NULL
|
#define __need_NULL
|
||||||
|
|
Loading…
Reference in New Issue