gh-157695: Rename HAVE_ICONV to _Py_HAVE_ICONV (#157821)

Update check_capi_macros_ignored.txt.

Author: vstinner

Include/internal/pycore_unicodeobject.h

@@ -244,7 +244,7 @@ extern int _PyUnicodeWriter_FormatV(
 
 /* --- iconv Codec -------------------------------------------------------- */
 
-#ifdef HAVE_ICONV
+#ifdef _Py_HAVE_ICONV
 extern PyObject* _PyUnicode_DecodeIconv(
     const char *encoding,       /* iconv encoding name */
     const char *string,         /* encoded string */

Modules/_codecsmodule.c

@@ -642,7 +642,7 @@ _codecs_code_page_decode_impl(PyObject *module, int codepage,
 
 #endif /* MS_WINDOWS */
 
-#ifdef HAVE_ICONV
+#ifdef _Py_HAVE_ICONV
 
 /*[clinic input]
 _codecs.iconv_decode
@@ -665,7 +665,7 @@ _codecs_iconv_decode_impl(PyObject *module, const char *encoding,
     return codec_tuple(decoded, consumed);
 }
 
-#endif /* HAVE_ICONV */
+#endif /* _Py_HAVE_ICONV */
 
 /* --- Encoder ------------------------------------------------------------ */
 
@@ -977,7 +977,7 @@ _codecs_code_page_encode_impl(PyObject *module, int code_page, PyObject *str,
 
 #endif /* MS_WINDOWS */
 
-#ifdef HAVE_ICONV
+#ifdef _Py_HAVE_ICONV
 
 /*[clinic input]
 _codecs.iconv_encode
@@ -996,7 +996,7 @@ _codecs_iconv_encode_impl(PyObject *module, const char *encoding,
                        PyUnicode_GET_LENGTH(str));
 }
 
-#endif /* HAVE_ICONV */
+#endif /* _Py_HAVE_ICONV */
 
 /* --- Error handler registry --------------------------------------------- */
 

Modules/clinic/_codecsmodule.c.h

@@ -67,7 +67,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <windows.h>
 #endif
 
-#ifdef HAVE_ICONV
+#ifdef _Py_HAVE_ICONV
 #include <iconv.h>                 // iconv_open()
 #endif
 
@@ -8220,7 +8220,7 @@ PyUnicode_AsMBCSString(PyObject *unicode)
 
 /* --- iconv Codec -------------------------------------------------------- */
 
-#ifdef HAVE_ICONV
+#ifdef _Py_HAVE_ICONV
 
 /* iconv pivot: native-endian UTF-32, a raw array of Py_UCS4.  One input unit is
    one code point, so error handlers get the exact position.  A platform whose
@@ -8602,7 +8602,7 @@ _PyUnicode_EncodeIconv(const char *encoding, PyObject *unicode,
     return result;
 }
 
-#endif /* HAVE_ICONV */
+#endif /* _Py_HAVE_ICONV */
 
 /* --- Character Mapping Codec -------------------------------------------- */
 

Objects/unicodeobject.c

@@ -298,7 +298,6 @@ HAVE_GRANTPT
 HAVE_GRP_H
 HAVE_HSTRERROR
 HAVE_HTOLE64
-HAVE_ICONV
 HAVE_ICONV_H
 HAVE_IF_INDEXTONAME
 HAVE_IF_NAMEINDEX

Tools/build/check_capi_macros_ignored.txt

@@ -3986,7 +3986,7 @@ if test "$py_have_iconv" = yes; then
     ])
   ])
   if test "$ac_cv_have_iconv" != no; then
-    AC_DEFINE([HAVE_ICONV], [1],
+    AC_DEFINE([_Py_HAVE_ICONV], [1],
               [Define if you have a working iconv() function.])
     if test "$ac_cv_have_iconv" = -liconv; then
       LIBS="-liconv $LIBS"

configure

@@ -742,9 +742,6 @@
 /* Define this if you have le64toh() */
 #undef HAVE_HTOLE64
 
-/* Define if you have a working iconv() function. */
-#undef HAVE_ICONV
-
 /* Define to 1 if you have the <iconv.h> header file. */
 #undef HAVE_ICONV_H
 
@@ -2210,6 +2207,9 @@
 /* Defined if _Float16 C type is supported */
 #undef _Py_HAVE_FLOAT16
 
+/* Define if you have a working iconv() function. */
+#undef _Py_HAVE_ICONV
+
 /* Define to 1 if libgcc __register_frame and __deregister_frame are linkable.
    */
 #undef _Py_HAVE_LIBGCC_EH_FRAME_REGISTRATION