diff options
Diffstat (limited to 'converters/libiconv/files/patch-include-iconv.h.in')
| -rw-r--r-- | converters/libiconv/files/patch-include-iconv.h.in | 60 |
1 files changed, 36 insertions, 24 deletions
diff --git a/converters/libiconv/files/patch-include-iconv.h.in b/converters/libiconv/files/patch-include-iconv.h.in index cd0e7e17567c..6fd627554add 100644 --- a/converters/libiconv/files/patch-include-iconv.h.in +++ b/converters/libiconv/files/patch-include-iconv.h.in @@ -1,25 +1,43 @@ ---- include/iconv.h.in.orig 2019-04-26 18:48:39 UTC +--- include/iconv.h.in.orig 2024-12-15 12:23:08 UTC +++ include/iconv.h.in -@@ -20,8 +20,10 @@ - #ifndef _LIBICONV_H - #define _LIBICONV_H +@@ -24,8 +24,10 @@ extern "C" { + extern "C" { + #endif +#ifndef LIBICONV_PLUG - #define _LIBICONV_VERSION 0x0111 /* version number: (major<<8) + minor */ + #define _LIBICONV_VERSION 0x0112 /* version number: (major<<8) + minor */ extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */ +#endif - /* We would like to #include any system header file which could define - iconv_t, 1. in order to eliminate the risk that the user gets compilation -@@ -93,7 +95,6 @@ extern int iconv_close (iconv_t cd); - #endif + #ifdef __cplusplus + } +@@ -69,7 +71,9 @@ extern "C" { + + /* Allocates descriptor for code conversion from encoding ‘fromcode’ to + encoding ‘tocode’. */ ++#ifndef LIBICONV_PLUG + #define iconv_open libiconv_open ++#endif + extern iconv_t iconv_open (const char* tocode, const char* fromcode); + /* Converts, using conversion descriptor ‘cd’, at most ‘*inbytesleft’ bytes +@@ -77,11 +81,15 @@ extern iconv_t iconv_open (const char* tocode, const c + ‘*outbuf’. + Decrements ‘*inbytesleft’ and increments ‘*inbuf’ by the same amount. + Decrements ‘*outbytesleft’ and increments ‘*outbuf’ by the same amount. */ ++#ifndef LIBICONV_PLUG + #define iconv libiconv ++#endif + extern size_t iconv (iconv_t cd, @ICONV_CONST@ char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft); --#ifndef LIBICONV_PLUG + /* Frees resources allocated for conversion descriptor ‘cd’. */ ++#ifndef LIBICONV_PLUG + #define iconv_close libiconv_close ++#endif + extern int iconv_close (iconv_t cd); - /* Nonstandard extensions. */ -@@ -126,12 +127,16 @@ typedef struct { +@@ -121,12 +129,16 @@ typedef struct { /* Allocates descriptor for code conversion from encoding ‘fromcode’ to encoding ‘tocode’ into preallocated memory. Returns an error indicator (0 or -1 with errno set). */ @@ -36,10 +54,10 @@ extern int iconvctl (iconv_t cd, int request, void* argument); /* Hook performed after every successful conversion of a Unicode character. */ -@@ -209,9 +214,15 @@ struct iconv_fallbacks { - #define ICONV_SET_DISCARD_ILSEQ 4 /* const int *argument */ - #define ICONV_SET_HOOKS 5 /* const struct iconv_hooks *argument */ - #define ICONV_SET_FALLBACKS 6 /* const struct iconv_fallbacks *argument */ +@@ -213,9 +225,15 @@ struct iconv_fallbacks { + #define ICONV_SET_DISCARD_INVALID 12 /* const int *argument */ + #define ICONV_GET_DISCARD_NON_IDENTICAL 13 /* int *argument */ + #define ICONV_SET_DISCARD_NON_IDENTICAL 14 /* const int *argument */ +#ifdef LIBICONV_PLUG +#define ICONV_GET_ILSEQ_INVALID 128 +#define ICONV_SET_ILSEQ_INVALID 129 @@ -52,7 +70,7 @@ extern void iconvlist (int (*do_one) (unsigned int namescount, const char * const * names, void* data), -@@ -223,6 +234,7 @@ extern const char * iconv_canonicalize ( +@@ -227,6 +245,7 @@ extern const char * iconv_canonicalize (const char * n /* Support for relocatable packages. */ @@ -60,7 +78,7 @@ /* Sets the original and the current installation prefix of the package. Relocation simply replaces a pathname starting with the original prefix by the corresponding pathname with the current prefix instead. Both -@@ -230,12 +242,12 @@ extern const char * iconv_canonicalize ( +@@ -234,6 +253,7 @@ extern void libiconv_set_relocation_prefix (const char instead of "/"). */ extern void libiconv_set_relocation_prefix (const char *orig_prefix, const char *curr_prefix); @@ -68,9 +86,3 @@ #ifdef __cplusplus } - #endif - --#endif - - - #endif /* _LIBICONV_H */ |