Fix portability problems with glibc 2.0, as reported in #449157.
diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
index 3f11054..7f7bdd2 100644
--- a/Modules/_localemodule.c
+++ b/Modules/_localemodule.c
@@ -527,6 +527,8 @@
ADDINT(ABMON_11);
ADDINT(ABMON_12);
+#ifdef RADIXCHAR
+ /* The following are not available with glibc 2.0 */
ADDINT(RADIXCHAR);
ADDINT(THOUSEP);
/* YESSTR and NOSTR are deprecated in glibc, since they are
@@ -537,6 +539,7 @@
ADDINT(NOSTR);
*/
ADDINT(CRNCYSTR);
+#endif
ADDINT(D_T_FMT);
ADDINT(D_FMT);
diff --git a/Modules/addrinfo.h b/Modules/addrinfo.h
index 6d0991d..686a4b8 100644
--- a/Modules/addrinfo.h
+++ b/Modules/addrinfo.h
@@ -67,6 +67,10 @@
#define AI_DEFAULT (AI_V4MAPPED_CFG | AI_ADDRCONFIG)
#endif
+#endif /* HAVE_GETADDRINFO */
+
+#ifndef HAVE_GETNAMEINFO
+
/*
* Constants for getnameinfo()
*/
@@ -86,6 +90,8 @@
#define NI_DGRAM 0x00000010
#endif
+#endif /* HAVE_GETNAMEINFO */
+
#ifndef HAVE_ADDRINFO
struct addrinfo {
int ai_flags; /* AI_PASSIVE, AI_CANONNAME */
@@ -137,4 +143,3 @@
#ifdef __cplusplus
}
#endif
-#endif
diff --git a/Modules/getnameinfo.c b/Modules/getnameinfo.c
index 475b531..4827bc6 100644
--- a/Modules/getnameinfo.c
+++ b/Modules/getnameinfo.c
@@ -81,6 +81,10 @@
#define ENI_FAMILY 5
#define ENI_SALEN 6
+/* forward declaration to make gcc happy */
+int getnameinfo Py_PROTO((const struct sockaddr *, size_t, char *, size_t,
+ char *, size_t, int));
+
int
getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
const struct sockaddr *sa;
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 16b81ac..525a19e 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -447,7 +447,11 @@
if (error == EAI_SYSTEM)
return PySocket_Err();
+#ifdef HAVE_GAI_STRERROR
v = Py_BuildValue("(is)", error, gai_strerror(error));
+#else
+ v = Py_BuildValue("(is)", error, "getaddrinfo failed");
+#endif
if (v != NULL) {
PyErr_SetObject(PyGAI_Error, v);
Py_DECREF(v);