Deleted Added
full compact
iconv.h (252547) iconv.h (254273)
1/* $FreeBSD: head/include/iconv.h 252547 2013-07-03 07:03:19Z peter $ */
1/* $FreeBSD: head/include/iconv.h 254273 2013-08-13 07:15:01Z peter $ */
2/* $NetBSD: iconv.h,v 1.6 2005/02/03 04:39:32 perry Exp $ */
3
4/*-
5 * Copyright (c) 2003 Citrus Project,
6 * Copyright (c) 2009, 2010 Gabor Kovesdan <gabor@FreeBSD.org>
7 * All rights reserved.
8 *
9 * Redistribution and use in source and binary forms, with or without

--- 26 unchanged lines hidden (view full) ---

36#include <sys/types.h>
37
38#include <stdbool.h>
39#include <wchar.h>
40
41#include <sys/cdefs.h>
42#include <sys/types.h>
43
2/* $NetBSD: iconv.h,v 1.6 2005/02/03 04:39:32 perry Exp $ */
3
4/*-
5 * Copyright (c) 2003 Citrus Project,
6 * Copyright (c) 2009, 2010 Gabor Kovesdan <gabor@FreeBSD.org>
7 * All rights reserved.
8 *
9 * Redistribution and use in source and binary forms, with or without

--- 26 unchanged lines hidden (view full) ---

36#include <sys/types.h>
37
38#include <stdbool.h>
39#include <wchar.h>
40
41#include <sys/cdefs.h>
42#include <sys/types.h>
43
44#define iconv_open libiconv_open
45#define iconv_close libiconv_close
46#define iconv libiconv
47#define iconv_t libiconv_t
44#include <_libiconv_compat.h>
45#ifdef __LIBICONV_COMPAT
46#define libiconv_open iconv_open
47#define libiconv_close iconv_close
48#define libiconv iconv
49#define libiconv_t iconv_t
50#endif
48
49struct __tag_iconv_t;
50typedef struct __tag_iconv_t *iconv_t;
51
52__BEGIN_DECLS
51
52struct __tag_iconv_t;
53typedef struct __tag_iconv_t *iconv_t;
54
55__BEGIN_DECLS
53iconv_t libiconv_open(const char *, const char *);
54size_t libiconv(iconv_t, const char ** __restrict,
55 size_t * __restrict, char ** __restrict,
56 size_t * __restrict);
57int libiconv_close(iconv_t);
56iconv_t iconv_open(const char *, const char *);
57size_t iconv(iconv_t, const char ** __restrict,
58 size_t * __restrict, char ** __restrict,
59 size_t * __restrict);
60int iconv_close(iconv_t);
58/*
59 * non-portable interfaces for iconv
60 */
61int __iconv_get_list(char ***, size_t *, bool);
62void __iconv_free_list(char **, size_t);
63size_t __iconv(iconv_t, const char **, size_t *, char **,
64 size_t *, __uint32_t, size_t *);
65#define __ICONV_F_HIDE_INVALID 0x0001
66
67/*
68 * GNU interfaces for iconv
69 */
61/*
62 * non-portable interfaces for iconv
63 */
64int __iconv_get_list(char ***, size_t *, bool);
65void __iconv_free_list(char **, size_t);
66size_t __iconv(iconv_t, const char **, size_t *, char **,
67 size_t *, __uint32_t, size_t *);
68#define __ICONV_F_HIDE_INVALID 0x0001
69
70/*
71 * GNU interfaces for iconv
72 */
70#define iconv_open_into libiconv_open_into
71#define iconvctl libiconvctl
72#define iconvlist libiconvlist
73#ifdef __LIBICONV_COMPAT
74#define libiconv_open_into iconv_open_into
75#define libiconvctl iconvctl
76#define libiconvlist iconvlist
77#define libiconv_set_relocation_prefix iconv_set_relocation_prefix
78#endif
73
74/* We have iconvctl() */
79
80/* We have iconvctl() */
75#define _LIBICONV_VERSION 0x0108
76extern int _libiconv_version;
81#define _ICONV_VERSION 0x0108
82extern int _iconv_version;
77
83
84#ifdef __LIBICONV_COMPAT
85#define _libiconv_version _iconv_version
86#define _LIBICONV_VERSION _ICONV_VERSION
87#endif
88
78typedef struct {
79 void *spaceholder[64];
80} iconv_allocation_t;
81
82int iconv_open_into(const char *, const char *, iconv_allocation_t *);
89typedef struct {
90 void *spaceholder[64];
91} iconv_allocation_t;
92
93int iconv_open_into(const char *, const char *, iconv_allocation_t *);
83void libiconv_set_relocation_prefix (const char *orig_prefix,
94void iconv_set_relocation_prefix(const char *orig_prefix,
84 const char *curr_prefix);
85
86/*
87 * iconvctl() request macros
88 */
89#define ICONV_TRIVIALP 0
90#define ICONV_GET_TRANSLITERATE 1
91#define ICONV_SET_TRANSLITERATE 2

--- 47 unchanged lines hidden ---
95 const char *curr_prefix);
96
97/*
98 * iconvctl() request macros
99 */
100#define ICONV_TRIVIALP 0
101#define ICONV_GET_TRANSLITERATE 1
102#define ICONV_SET_TRANSLITERATE 2

--- 47 unchanged lines hidden ---