diff options
Diffstat (limited to 'converters/libiconv/files/patch-include-iconv.h.in')
| -rw-r--r-- | converters/libiconv/files/patch-include-iconv.h.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/converters/libiconv/files/patch-include-iconv.h.in b/converters/libiconv/files/patch-include-iconv.h.in index e29d9104314c..071ad7d160bb 100644 --- a/converters/libiconv/files/patch-include-iconv.h.in +++ b/converters/libiconv/files/patch-include-iconv.h.in @@ -1,17 +1,17 @@ ---- include/iconv.h.in.orig 2011-08-07 17:48:03 UTC +--- include/iconv.h.in.orig 2019-04-26 18:48:39 UTC +++ include/iconv.h.in -@@ -21,8 +21,10 @@ +@@ -20,8 +20,10 @@ #ifndef _LIBICONV_H #define _LIBICONV_H +#ifndef LIBICONV_PLUG - #define _LIBICONV_VERSION 0x010E /* version number: (major<<8) + minor */ + #define _LIBICONV_VERSION 0x0110 /* 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 -@@ -94,7 +96,6 @@ extern int iconv_close (iconv_t cd); +@@ -93,7 +95,6 @@ extern int iconv_close (iconv_t cd); #endif @@ -19,7 +19,7 @@ /* Nonstandard extensions. */ -@@ -127,12 +128,16 @@ typedef struct { +@@ -126,12 +127,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,7 +36,7 @@ extern int iconvctl (iconv_t cd, int request, void* argument); /* Hook performed after every successful conversion of a Unicode character. */ -@@ -210,9 +215,15 @@ struct iconv_fallbacks { +@@ -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 */ @@ -52,7 +52,7 @@ extern void iconvlist (int (*do_one) (unsigned int namescount, const char * const * names, void* data), -@@ -224,6 +235,7 @@ extern const char * iconv_canonicalize (const char * n +@@ -223,6 +234,7 @@ extern const char * iconv_canonicalize ( /* Support for relocatable packages. */ @@ -60,7 +60,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 -@@ -231,12 +243,12 @@ extern const char * iconv_canonicalize (const char * n +@@ -230,12 +242,12 @@ extern const char * iconv_canonicalize ( instead of "/"). */ extern void libiconv_set_relocation_prefix (const char *orig_prefix, const char *curr_prefix); |