Line 0
Link Here
|
|
|
1 |
--- include/iconv.h.in.orig 2011-08-07 17:48:03 UTC |
2 |
+++ include/iconv.h.in |
3 |
@@ -21,8 +21,10 @@ |
4 |
#ifndef _LIBICONV_H |
5 |
#define _LIBICONV_H |
6 |
|
7 |
+#ifndef LIBICONV_PLUG |
8 |
#define _LIBICONV_VERSION 0x010E /* version number: (major<<8) + minor */ |
9 |
extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */ |
10 |
+#endif |
11 |
|
12 |
/* We would like to #include any system header file which could define |
13 |
iconv_t, 1. in order to eliminate the risk that the user gets compilation |
14 |
@@ -94,7 +96,6 @@ extern int iconv_close (iconv_t cd); |
15 |
#endif |
16 |
|
17 |
|
18 |
-#ifndef LIBICONV_PLUG |
19 |
|
20 |
/* Nonstandard extensions. */ |
21 |
|
22 |
@@ -127,12 +128,16 @@ typedef struct { |
23 |
/* Allocates descriptor for code conversion from encoding ‘fromcode’ to |
24 |
encoding ‘tocode’ into preallocated memory. Returns an error indicator |
25 |
(0 or -1 with errno set). */ |
26 |
+#ifndef LIBICONV_PLUG |
27 |
#define iconv_open_into libiconv_open_into |
28 |
+#endif |
29 |
extern int iconv_open_into (const char* tocode, const char* fromcode, |
30 |
iconv_allocation_t* resultp); |
31 |
|
32 |
/* Control of attributes. */ |
33 |
+#ifndef LIBICONV_PLUG |
34 |
#define iconvctl libiconvctl |
35 |
+#endif |
36 |
extern int iconvctl (iconv_t cd, int request, void* argument); |
37 |
|
38 |
/* Hook performed after every successful conversion of a Unicode character. */ |
39 |
@@ -210,9 +215,15 @@ struct iconv_fallbacks { |
40 |
#define ICONV_SET_DISCARD_ILSEQ 4 /* const int *argument */ |
41 |
#define ICONV_SET_HOOKS 5 /* const struct iconv_hooks *argument */ |
42 |
#define ICONV_SET_FALLBACKS 6 /* const struct iconv_fallbacks *argument */ |
43 |
+#ifdef LIBICONV_PLUG |
44 |
+#define ICONV_GET_ILSEQ_INVALID 128 |
45 |
+#define ICONV_SET_ILSEQ_INVALID 129 |
46 |
+#endif |
47 |
|
48 |
/* Listing of locale independent encodings. */ |
49 |
+#ifndef LIBICONV_PLUG |
50 |
#define iconvlist libiconvlist |
51 |
+#endif |
52 |
extern void iconvlist (int (*do_one) (unsigned int namescount, |
53 |
const char * const * names, |
54 |
void* data), |
55 |
@@ -224,6 +235,7 @@ extern const char * iconv_canonicalize (const char * n |
56 |
|
57 |
/* Support for relocatable packages. */ |
58 |
|
59 |
+#ifndef LIBICONV_PLUG |
60 |
/* Sets the original and the current installation prefix of the package. |
61 |
Relocation simply replaces a pathname starting with the original prefix |
62 |
by the corresponding pathname with the current prefix instead. Both |
63 |
@@ -231,12 +243,12 @@ extern const char * iconv_canonicalize (const char * n |
64 |
instead of "/"). */ |
65 |
extern void libiconv_set_relocation_prefix (const char *orig_prefix, |
66 |
const char *curr_prefix); |
67 |
+#endif |
68 |
|
69 |
#ifdef __cplusplus |
70 |
} |
71 |
#endif |
72 |
|
73 |
-#endif |
74 |
|
75 |
|
76 |
#endif /* _LIBICONV_H */ |