--- include/iconv.h.in.orig	2024-12-15 12:23:08 UTC
+++ include/iconv.h.in
@@ -24,8 +24,10 @@ extern "C" {
 extern "C" {
 #endif
 
+#ifndef LIBICONV_PLUG
 #define _LIBICONV_VERSION 0x0112    /* version number: (major<<8) + minor */
 extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */
+#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);
 
 /* Frees resources allocated for conversion descriptor ‘cd’. */
+#ifndef LIBICONV_PLUG
 #define iconv_close libiconv_close
+#endif
 extern int iconv_close (iconv_t cd);
 
 
@@ -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). */
+#ifndef LIBICONV_PLUG
 #define iconv_open_into libiconv_open_into
+#endif
 extern int iconv_open_into (const char* tocode, const char* fromcode,
                             iconv_allocation_t* resultp);
 
 /* Control of attributes. */
+#ifndef LIBICONV_PLUG
 #define iconvctl libiconvctl
+#endif
 extern int iconvctl (iconv_t cd, int request, void* argument);
 
 /* Hook performed after every successful conversion of a Unicode character. */
@@ -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
+#endif
 
 /* Listing of locale independent encodings. */
+#ifndef LIBICONV_PLUG
 #define iconvlist libiconvlist
+#endif
 extern void iconvlist (int (*do_one) (unsigned int namescount,
                                       const char * const * names,
                                       void* data),
@@ -227,6 +245,7 @@ extern const char * iconv_canonicalize (const char * n
 
 /* Support for relocatable packages.  */
 
+#ifndef LIBICONV_PLUG
 /* 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
@@ -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);
+#endif
 
 #ifdef __cplusplus
 }